Skip to content

O
opencv
Commit 35af5dac authored by Vadim Pisarevsky's avatar Vadim Pisarevsky
Browse files
Options

do not define CVAPI_EXPORTS when OpenCV is built statically (thanks to Mika Fischer for the patch)

parent caa943c8
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
OpenCVModule.cmake
View file @ 35af5dac
...@@ -2,7 +2,9 @@ ...@@ -2,7 +2,9 @@
macro(define_opencv_module name) macro(define_opencv_module name)
project(opencv_${name}) project(opencv_${name})
add_definitions(-DCVAPI_EXPORTS) if (OPENCV_BUILD_SHARED_LIB)
add_definitions(-DCVAPI_EXPORTS)
endif()
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include" include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include"
"${CMAKE_CURRENT_SOURCE_DIR}/src" "${CMAKE_CURRENT_SOURCE_DIR}/src"
......
modules/highgui/CMakeLists.txt
View file @ 35af5dac
...@@ -224,7 +224,9 @@ set(lib_srcs ${highgui_srcs} ${grfmt_srcs}) ...@@ -224,7 +224,9 @@ set(lib_srcs ${highgui_srcs} ${grfmt_srcs})
# ---------------------------------------------------------------------------------- # ----------------------------------------------------------------------------------
set(the_target "opencv_highgui") set(the_target "opencv_highgui")
add_definitions(-DHIGHGUI_EXPORTS -DCVAPI_EXPORTS) if (OPENCV_BUILD_SHARED_LIB)
add_definitions(-DHIGHGUI_EXPORTS -DCVAPI_EXPORTS)
endif()
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include" include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include"
"${CMAKE_CURRENT_SOURCE_DIR}/../core/include" "${CMAKE_CURRENT_SOURCE_DIR}/../core/include"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment