From 1b1246cbae9b7de484c125907b4013536545de41 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Mon, 24 Aug 2015 13:40:10 +0300 Subject: [PATCH] samples: fix OpenCL detection / build warning --- samples/opencl/CMakeLists.txt | 6 +++++- samples/opencl/opencl-opencv-interop.cpp | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/samples/opencl/CMakeLists.txt b/samples/opencl/CMakeLists.txt index a4525650e1..6b247e3e75 100644 --- 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 index 8deb799eea..5d5d52e02b 100644 --- a/samples/opencl/opencl-opencv-interop.cpp +++ b/samples/opencl/opencl-opencv-interop.cpp @@ -14,6 +14,8 @@ #include #include +#define CL_USE_DEPRECATED_OPENCL_2_0_APIS // eliminate build warning + #if __APPLE__ #include #else