core: fix OpenCL runtime compilation with HAVE_OPENCL_STATIC

modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_core.hpp

@@ -95,7 +95,11 @@
 #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

modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_gl.hpp

@@ -17,7 +17,11 @@
 #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

modules/core/include/opencv2/core/opencl/runtime/opencl_core.hpp

@@ -44,16 +44,6 @@
 
 #ifdef HAVE_OPENCL
 
-#if defined(HAVE_OPENCL_STATIC)
-
-#if defined __APPLE__
-#include <OpenCL/cl.h>
-#else
-#include <CL/cl.h>
-#endif
-
-#else // HAVE_OPENCL_STATIC
-
 #ifndef CL_RUNTIME_EXPORT
 #if (defined(BUILD_SHARED_LIBS) || defined(OPENCV_CORE_SHARED)) && (defined _WIN32 || defined WINCE)
 #define CL_RUNTIME_EXPORT __declspec(dllimport)
@@ -76,8 +66,6 @@
 
 #include "autogenerated/opencl_core.hpp"
 
-#endif // HAVE_OPENCL_STATIC
-
 #ifndef CL_DEVICE_DOUBLE_FP_CONFIG
 #define CL_DEVICE_DOUBLE_FP_CONFIG 0x1032
 #endif

modules/core/include/opencv2/core/opencl/runtime/opencl_gl.hpp

@@ -46,20 +46,8 @@
 
 #include "opencl_core.hpp"
 
-#if defined(HAVE_OPENCL_STATIC)
-
-#if defined __APPLE__
-#include <OpenCL/cl_gl.h>
-#else
-#include <CL/cl_gl.h>
-#endif
-
-#else // HAVE_OPENCL_STATIC
-
 #include "autogenerated/opencl_gl.hpp"
 
-#endif // HAVE_OPENCL_STATIC
-
 #endif // defined HAVE_OPENCL && defined HAVE_OPENGL
 
 #endif // OPENCV_CORE_OCL_RUNTIME_OPENCL_GL_HPP

modules/core/include/opencv2/core/opencl/runtime/opencl_svm_20.hpp

@@ -8,8 +8,6 @@
 
 #include "opencl_svm_definitions.hpp"
 
-#ifndef HAVE_OPENCL_STATIC
-
 #undef clSVMAlloc
 #define clSVMAlloc clSVMAlloc_pfn
 #undef clSVMFree
@@ -45,8 +43,6 @@ extern CL_RUNTIME_EXPORT cl_int (CL_API_CALL *clEnqueueSVMMap)(cl_command_queue
 extern CL_RUNTIME_EXPORT cl_int (CL_API_CALL *clEnqueueSVMUnmap)(cl_command_queue command_queue, void* svm_ptr,
         cl_uint num_events_in_wait_list, const cl_event* event_wait_list, cl_event* event);
 
-#endif // HAVE_OPENCL_STATIC
-
 #endif // HAVE_OPENCL_SVM
 
 #endif // OPENCV_CORE_OCL_RUNTIME_OPENCL_SVM_2_0_HPP