Fixed building with OpenCL, but without the ocl module.

HAVE_opencv_ocl implies HAVE_OPENCL, so checking for both is not
necessary.
pull/1718/head
Roman Donchenko 11 years ago
parent 8a4f1bbbdf
commit d07e7897a0
  1. 2
      cmake/OpenCVModule.cmake
  2. 2
      modules/superres/perf/perf_superres_ocl.cpp
  3. 2
      samples/gpu/CMakeLists.txt

@ -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"

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

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

Loading…
Cancel
Save