ocl: OpenCL headers are located in "CL" subfolder (3rdparty/include)

87bbaa2c · Alexander Alekhin · 2c4ed7f8 · 87bbaa2c · 87bbaa2c · 87bbaa2c
Commit 87bbaa2c authored Feb 04, 2016 by Alexander Alekhin
5 changed files
--- a/cmake/checks/opencl.cpp
+++ b/cmake/checks/opencl.cpp
-#if defined __APPLE__
+// custom OpenCL headers are located in "CL" subfolder (3rdparty/include/...)
-#include <OpenCL/cl.h>
-#else
 #include <CL/cl.h>
-#endif
 #ifndef _MSC_VER
 #ifdef CL_VERSION_1_2

--- a/modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_core.hpp
+++ b/modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_core.hpp
@@ -95,11 +95,7 @@
 #define clUnloadPlatformCompiler clUnloadPlatformCompiler_
 #define clWaitForEvents clWaitForEvents_
-#if defined __APPLE__
-#include <OpenCL/cl.h>
-#else
 #include <CL/cl.h>
-#endif
 // generated by parser_cl.py
 #undef clBuildProgram

--- a/modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_gl.hpp
+++ b/modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_gl.hpp
@@ -17,11 +17,7 @@
 #define clGetGLObjectInfo clGetGLObjectInfo_
 #define clGetGLTextureInfo clGetGLTextureInfo_
-#if defined __APPLE__
-#include <OpenCL/cl_gl.h>
-#else
 #include <CL/cl_gl.h>
-#endif
 // generated by parser_cl.py
 #undef clCreateFromGLBuffer

--- a/modules/core/src/opencl/runtime/generator/template/opencl_core.hpp.in
+++ b/modules/core/src/opencl/runtime/generator/template/opencl_core.hpp.in
@@ -4,11 +4,7 @@
 @CL_REMAP_ORIGIN@
-#if defined __APPLE__
-#include <OpenCL/cl.h>
-#else
 #include <CL/cl.h>
-#endif
 @CL_REMAP_DYNAMIC@

--- a/modules/core/src/opencl/runtime/generator/template/opencl_gl.hpp.in
+++ b/modules/core/src/opencl/runtime/generator/template/opencl_gl.hpp.in
@@ -4,11 +4,7 @@
 @CL_REMAP_ORIGIN@
-#if defined __APPLE__
-#include <OpenCL/cl_gl.h>
-#else
 #include <CL/cl_gl.h>
-#endif
 @CL_REMAP_DYNAMIC@