removed OPENCV_BUILD_SHARED_LIB in favor of BUILD_SHARED_LIBS

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b3d95ae..c67a2fd 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -99,13 +99,6 @@ endif()
 # ----------------------------------------------------------------------------\r
 set(BUILD_SHARED_LIBS ON CACHE BOOL "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)")\r
 \r
-if(BUILD_SHARED_LIBS)\r
-    set(OPENCV_BUILD_SHARED_LIB 1) # For cvconfig.h, etc.\r
-else(BUILD_SHARED_LIBS)\r
-    set(OPENCV_BUILD_SHARED_LIB 0)\r
-endif(BUILD_SHARED_LIBS)\r
-\r
-\r
 # ----------------------------------------------------------------------------\r
 #  Variables for cvconfig.h.cmake\r
 # ----------------------------------------------------------------------------\r

diff --git a/OpenCVConfig.cmake.in b/OpenCVConfig.cmake.in
index 2589594..5864419 100644 (file)
--- a/OpenCVConfig.cmake.in
+++ b/OpenCVConfig.cmake.in
@@ -86,7 +86,7 @@ endif(NOT @CMAKE_BASE_INCLUDE_DIRS_CONFIGCMAKE@ STREQUAL  "")
 \r
 # For OpenCV built as static libs, we need the user to link against\r
 #  many more dependencies:\r
-IF (NOT @OPENCV_BUILD_SHARED_LIB@)\r
+IF (NOT @BUILD_SHARED_LIBS@)\r
     # Under static libs, the user of OpenCV needs access to the 3rdparty libs as well:\r
     LINK_DIRECTORIES(@CMAKE_LIB_DIRS_CONFIGCMAKE@/../3rdparty/lib)\r
     if(WIN32)\r
@@ -112,7 +112,7 @@ IF (NOT @OPENCV_BUILD_SHARED_LIB@)
         set(OpenCV_LIBS ${OpenCV_LIBS} ${OPENCV_EXTRA_COMPONENTS})\r
     endif(CMAKE_MAJOR_VERSION GREATER 2  OR  CMAKE_MINOR_VERSION GREATER 4)\r
 \r
-ENDIF(NOT @OPENCV_BUILD_SHARED_LIB@)\r
+ENDIF(NOT @BUILD_SHARED_LIBS@)\r
 \r
 \r
 # ======================================================\r

diff --git a/OpenCVModule.cmake b/OpenCVModule.cmake
index ce27185..ab12991 100644 (file)
--- a/OpenCVModule.cmake
+++ b/OpenCVModule.cmake
@@ -41,7 +41,7 @@ macro(define_opencv_module name)
                set_target_properties(${the_target} PROPERTIES FOLDER "modules")
        endif() 
                
-       if (OPENCV_BUILD_SHARED_LIB)
+        if (BUILD_SHARED_LIBS)
                if(MSVC)
                        set_target_properties(${the_target} PROPERTIES DEFINE_SYMBOL CVAPI_EXPORTS)
                else()

diff --git a/cvconfig.h.cmake b/cvconfig.h.cmake
index 38cbe30..e61a226 100644 (file)
--- a/cvconfig.h.cmake
+++ b/cvconfig.h.cmake
@@ -122,7 +122,7 @@
 #cmakedefine  HAVE_IPP
 
 /* OpenCV compiled as static or dynamic libs */
-#cmakedefine  OPENCV_BUILD_SHARED_LIB
+#cmakedefine  BUILD_SHARED_LIBS
 
 /* Name of package */
 #define  PACKAGE "${PACKAGE}"

diff --git a/modules/core/src/system.cpp b/modules/core/src/system.cpp
index a2a2b8e..78ae6fa 100644 (file)
--- a/modules/core/src/system.cpp
+++ b/modules/core/src/system.cpp
@@ -748,7 +748,7 @@ cvGetModuleInfo( const char* name, const char **version, const char **plugin_lis
         *plugin_list = plugin_list_buf;
 }
 
-#if defined OPENCV_BUILD_SHARED_LIB && defined CVAPI_EXPORTS && defined WIN32 && !defined WINCE
+#if defined BUILD_SHARED_LIBS && defined CVAPI_EXPORTS && defined WIN32 && !defined WINCE
 BOOL WINAPI DllMain( HINSTANCE, DWORD  fdwReason, LPVOID )
 {
     if( fdwReason == DLL_THREAD_DETACH || fdwReason == DLL_PROCESS_DETACH )

diff --git a/modules/gpu/CMakeLists.txt b/modules/gpu/CMakeLists.txt
index db7821b..13c5e5e 100644 (file)
--- a/modules/gpu/CMakeLists.txt
+++ b/modules/gpu/CMakeLists.txt
@@ -68,7 +68,7 @@ if (HAVE_CUDA)
         string(REPLACE "/EHsc-" "/EHs" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
     endif()
        
-       if (OPENCV_BUILD_SHARED_LIB) 
+    if (BUILD_SHARED_LIBS)
                set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} "-Xcompiler;-DCVAPI_EXPORTS")
        endif()
     

diff --git a/modules/highgui/CMakeLists.txt b/modules/highgui/CMakeLists.txt
index 37d2f0b..8017c63 100644 (file)
--- a/modules/highgui/CMakeLists.txt
+++ b/modules/highgui/CMakeLists.txt
@@ -244,7 +244,7 @@ set(lib_srcs ${highgui_srcs} ${grfmt_srcs})
 # ----------------------------------------------------------------------------------
 set(the_target "opencv_highgui")
 
-if (OPENCV_BUILD_SHARED_LIB) 
+if (BUILD_SHARED_LIBS)
     add_definitions(-DHIGHGUI_EXPORTS -DCVAPI_EXPORTS)
 endif()