generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #5241 from alalek:fix_sample_opencl

Browse Source
This commit is contained in:
Vadim Pisarevsky 2015-08-25 07:51:32 +00:00
commit ef1d4eba84
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
samples/opencl/CMakeLists.txt
View File

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

2
samples/opencl/opencl-opencv-interop.cpp
View File

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