generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Vadim Pisarevsky 2011-04-26 13:07:05 +00:00
parent caa943c85f
commit 35af5dacde
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenCVModule.cmake
View File

@ -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"

4
modules/highgui/CMakeLists.txt
View File

@ -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"