potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00
Code Packages Releases Wiki Activity

Merge pull request #9838 from alalek:fix_ocl_world_build

Browse Source
This commit is contained in:
Alexander Alekhin
2017-10-12 09:40:32 +00:00
parent e356ca2369 88225eb65e
commit 4ae30ecdd9
4 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/include/opencv2/core/opencl/runtime/opencl_clamdblas.hpp
+1 -7
View File
@@ -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"
modules/core/include/opencv2/core/opencl/runtime/opencl_clamdfft.hpp
+1 -7
View File
@@ -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"
modules/core/include/opencv2/core/opencl/runtime/opencl_core.hpp
+2 -1
View File
@@ -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
modules/world/CMakeLists.txt
+2
View File
@@ -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()