diff --git a/modules/core/include/opencv2/core/opencl/runtime/opencl_clamdblas.hpp b/modules/core/include/opencv2/core/opencl/runtime/opencl_clamdblas.hpp index a64447e1a5..2ad8ac0b5d 100644 --- a/modules/core/include/opencv2/core/opencl/runtime/opencl_clamdblas.hpp +++ b/modules/core/include/opencv2/core/opencl/runtime/opencl_clamdblas.hpp @@ -44,13 +44,7 @@ #ifdef HAVE_CLAMDBLAS -#ifndef CL_RUNTIME_EXPORT -#if (defined(BUILD_SHARED_LIBS) || defined(OPENCV_CORE_SHARED)) && (defined _WIN32 || defined WINCE) -#define CL_RUNTIME_EXPORT __declspec(dllimport) -#else -#define CL_RUNTIME_EXPORT -#endif -#endif +#include "opencl_core.hpp" #include "autogenerated/opencl_clamdblas.hpp" diff --git a/modules/core/include/opencv2/core/opencl/runtime/opencl_clamdfft.hpp b/modules/core/include/opencv2/core/opencl/runtime/opencl_clamdfft.hpp index e96dad268f..a328f722fc 100644 --- a/modules/core/include/opencv2/core/opencl/runtime/opencl_clamdfft.hpp +++ b/modules/core/include/opencv2/core/opencl/runtime/opencl_clamdfft.hpp @@ -44,13 +44,7 @@ #ifdef HAVE_CLAMDFFT -#ifndef CL_RUNTIME_EXPORT -#if (defined(BUILD_SHARED_LIBS) || defined(OPENCV_CORE_SHARED)) && (defined _WIN32 || defined WINCE) -#define CL_RUNTIME_EXPORT __declspec(dllimport) -#else -#define CL_RUNTIME_EXPORT -#endif -#endif +#include "opencl_core.hpp" #include "autogenerated/opencl_clamdfft.hpp" diff --git a/modules/core/include/opencv2/core/opencl/runtime/opencl_core.hpp b/modules/core/include/opencv2/core/opencl/runtime/opencl_core.hpp index ad46e257a0..ea9a7ffa1e 100644 --- a/modules/core/include/opencv2/core/opencl/runtime/opencl_core.hpp +++ b/modules/core/include/opencv2/core/opencl/runtime/opencl_core.hpp @@ -45,7 +45,8 @@ #ifdef HAVE_OPENCL #ifndef CL_RUNTIME_EXPORT -#if (defined(BUILD_SHARED_LIBS) || defined(OPENCV_CORE_SHARED)) && (defined _WIN32 || defined WINCE) +#if (defined(BUILD_SHARED_LIBS) || defined(OPENCV_CORE_SHARED)) && (defined _WIN32 || defined WINCE) && \ + !(defined(__OPENCV_BUILD) && defined(OPENCV_MODULE_IS_PART_OF_WORLD)) #define CL_RUNTIME_EXPORT __declspec(dllimport) #else #define CL_RUNTIME_EXPORT diff --git a/modules/world/CMakeLists.txt b/modules/world/CMakeLists.txt index 96d12f8af9..943a27ea19 100644 --- a/modules/world/CMakeLists.txt +++ b/modules/world/CMakeLists.txt @@ -59,6 +59,8 @@ ocv_module_include_directories() #message(STATUS "${OPENCV_MODULE_${the_module}_SOURCES}") ocv_create_module(${link_deps}) +ocv_target_compile_definitions(${the_module} PRIVATE OPENCV_MODULE_IS_PART_OF_WORLD=1) + if(BUILD_opencv_imgcodecs AND OPENCV_MODULE_opencv_imgcodecs_IS_PART_OF_WORLD) ocv_imgcodecs_configure_target() endif()