Commit d07e7897 authored by Roman Donchenko's avatar Roman Donchenko

Fixed building with OpenCL, but without the ocl module.

HAVE_opencv_ocl implies HAVE_OPENCL, so checking for both is not
necessary.
parent 8a4f1bbb
...@@ -499,7 +499,7 @@ macro(ocv_glob_module_sources) ...@@ -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"
......
...@@ -42,7 +42,7 @@ ...@@ -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;
......
...@@ -49,7 +49,7 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND) ...@@ -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()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment