diff --git a/cmake/checks/opencl.cpp b/cmake/checks/opencl.cpp index 95a36f3ac7..b71b92f670 100644 --- a/cmake/checks/opencl.cpp +++ b/cmake/checks/opencl.cpp @@ -1,8 +1,5 @@ -#if defined __APPLE__ -#include -#else +// custom OpenCL headers are located in "CL" subfolder (3rdparty/include/...) #include -#endif #ifndef _MSC_VER #ifdef CL_VERSION_1_2 diff --git a/modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_core.hpp b/modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_core.hpp index f824ce9334..801709e2c0 100644 --- 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 -#else #include -#endif // generated by parser_cl.py #undef clBuildProgram diff --git a/modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_gl.hpp b/modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_gl.hpp index f37ad158e1..64a7fedbac 100644 --- 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 -#else #include -#endif // generated by parser_cl.py #undef clCreateFromGLBuffer diff --git a/modules/core/src/opencl/runtime/generator/template/opencl_core.hpp.in b/modules/core/src/opencl/runtime/generator/template/opencl_core.hpp.in index 4196622c0b..b6c8f05d51 100644 --- 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 -#else #include -#endif @CL_REMAP_DYNAMIC@ diff --git a/modules/core/src/opencl/runtime/generator/template/opencl_gl.hpp.in b/modules/core/src/opencl/runtime/generator/template/opencl_gl.hpp.in index 24434d2de7..4bed423318 100644 --- 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 -#else #include -#endif @CL_REMAP_DYNAMIC@