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

14 years ago · 35af5dacde
parent caa943c85f
commit 35af5dacde
2 changed files with 6 additions and 2 deletions
--- a/OpenCVModule.cmake
+++ b/OpenCVModule.cmake
@ -2,7 +2,9 @@
 macro(define_opencv_module 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"
                        "${CMAKE_CURRENT_SOURCE_DIR}/src"
--- a/modules/highgui/CMakeLists.txt
+++ b/modules/highgui/CMakeLists.txt
@ -224,7 +224,9 @@ set(lib_srcs ${highgui_srcs} ${grfmt_srcs})
 # ----------------------------------------------------------------------------------
 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"
 					"${CMAKE_CURRENT_SOURCE_DIR}/../core/include"