generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed building with OpenCL, but without the ocl module.

Browse Source 
HAVE_opencv_ocl implies HAVE_OPENCL, so checking for both is not
necessary.
This commit is contained in:
Roman Donchenko
2013-10-30 14:02:08 +04:00
parent 8a4f1bbbdf
commit d07e7897a0
3 changed files with 3 additions and 3 deletions
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})
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})
add_custom_command(
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/opencl_kernels.cpp" "${CMAKE_CURRENT_BINARY_DIR}/opencl_kernels.hpp"