mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-18 14:13:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1718 from SpecLad:have-opencv-ocl

Browse Source
This commit is contained in:
Roman Donchenko 2013-10-30 17:33:03 +04:00 committed by OpenCV Buildbot
commit 2f4d68c746
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/OpenCVModule.cmake
View File

@ -499,7 +499,7 @@ macro(ocv_glob_module_sources)
source_group("Src" FILES ${lib_srcs} ${lib_int_hdrs}) source_group("Src" FILES ${lib_srcs} ${lib_int_hdrs})
file(GLOB cl_kernels "src/opencl/*.cl") file(GLOB cl_kernels "src/opencl/*.cl")
if(HAVE_OPENCL AND cl_kernels) if(HAVE_opencv_ocl AND cl_kernels)
ocv_include_directories(${OPENCL_INCLUDE_DIRS}) ocv_include_directories(${OPENCL_INCLUDE_DIRS})
add_custom_command( add_custom_command(
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/opencl_kernels.cpp" "${CMAKE_CURRENT_BINARY_DIR}/opencl_kernels.hpp" OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/opencl_kernels.cpp" "${CMAKE_CURRENT_BINARY_DIR}/opencl_kernels.hpp"

2
modules/superres/perf/perf_superres_ocl.cpp
View File

@ -42,7 +42,7 @@
#include "perf_precomp.hpp" #include "perf_precomp.hpp"
#ifdef HAVE_OPENCL #ifdef HAVE_OPENCV_OCL
#include "opencv2/ocl/ocl.hpp" #include "opencv2/ocl/ocl.hpp"
using namespace std; using namespace std;

2
samples/gpu/CMakeLists.txt
View File

@ -49,7 +49,7 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
target_link_libraries(${the_target} opencv_nonfree) target_link_libraries(${the_target} opencv_nonfree)
endif() endif()
if(HAVE_OPENCL) if(HAVE_opencv_ocl)
target_link_libraries(${the_target} opencv_ocl) target_link_libraries(${the_target} opencv_ocl)
endif() endif()