Merge pull request opencv#5241 from alalek:fix_sample_opencl

vpisarev · vpisarev · commit ef1d4eba84ad · 2015-08-25T07:51:33.000Z
diff --git 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)
diff --git 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
