From 35af5dacded8cdf1ee041b3e666f633d28e2284d Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Tue, 26 Apr 2011 13:07:05 +0000 Subject: [PATCH] do not define CVAPI_EXPORTS when OpenCV is built statically (thanks to Mika Fischer for the patch) --- OpenCVModule.cmake | 4 +++- modules/highgui/CMakeLists.txt | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/OpenCVModule.cmake b/OpenCVModule.cmake index f922dde11..5f32c10aa 100644 --- 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" diff --git a/modules/highgui/CMakeLists.txt b/modules/highgui/CMakeLists.txt index 92c7cab8c..4e06e7cc9 100644 --- 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"