samples: fix OpenCL detection / build warning

10 years ago · 1b1246cbae
parent c385ac575d
commit 1b1246cbae
2 changed files with 7 additions and 1 deletions
--- a/samples/opencl/CMakeLists.txt
+++ b/samples/opencl/CMakeLists.txt
@ -18,7 +18,11 @@ ocv_check_dependencies(${OPENCV_OPENCL_SAMPLES_REQUIRED_DEPS})

 if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)

-  find_package(OpenCL 1.2 REQUIRED)
+  find_package(OpenCL 1.2 QUIET)
+  if(NOT OpenCL_FOUND)
+    message(STATUS "OpenCL samples are skipped: OpenCL SDK is required")
+    return()
+  endif()

  set(project "opencl")
  string(TOUPPER "${project}" project_upper)
--- a/samples/opencl/opencl-opencv-interop.cpp
+++ b/samples/opencl/opencl-opencv-interop.cpp
@ -14,6 +14,8 @@
 #include <iomanip>
 #include <stdexcept>

+#define CL_USE_DEPRECATED_OPENCL_2_0_APIS // eliminate build warning
+
 #if __APPLE__
 #include <OpenCL/cl.h>
 #else