Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
88225eb6
Commit
88225eb6
authored
Oct 11, 2017
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ocl: fix world compilation on Windows
parent
ec240915
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
15 deletions
+6
-15
opencl_clamdblas.hpp
.../include/opencv2/core/opencl/runtime/opencl_clamdblas.hpp
+1
-7
opencl_clamdfft.hpp
...e/include/opencv2/core/opencl/runtime/opencl_clamdfft.hpp
+1
-7
opencl_core.hpp
.../core/include/opencv2/core/opencl/runtime/opencl_core.hpp
+2
-1
CMakeLists.txt
modules/world/CMakeLists.txt
+2
-0
No files found.
modules/core/include/opencv2/core/opencl/runtime/opencl_clamdblas.hpp
View file @
88225eb6
...
...
@@ -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
View file @
88225eb6
...
...
@@ -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
View file @
88225eb6
...
...
@@ -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
View file @
88225eb6
...
...
@@ -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
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment