fix for ticket #1153 propagated to trunk

diff --git a/OpenCVConfig.cmake.in b/OpenCVConfig.cmake.in
index 8c6948e..7234be2 100644 (file)
--- a/OpenCVConfig.cmake.in
+++ b/OpenCVConfig.cmake.in
@@ -89,7 +89,9 @@ 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 @BUILD_SHARED_LIBS@)\r
+set(OpenCV_SHARED @BUILD_SHARED_LIBS@)\r
+\r
+IF (NOT OpenCV_SHARED)\r
     # Under static libs, the user of OpenCV needs access to the 3rdparty libs as well:\r
     if(WIN32 AND NOT ANDROID)\r
         LINK_DIRECTORIES(@CMAKE_BASE_INCLUDE_DIRS_CONFIGCMAKE@/3rdparty/lib)\r
@@ -111,7 +113,7 @@ IF (NOT @BUILD_SHARED_LIBS@)
         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 @BUILD_SHARED_LIBS@)\r
+ENDIF()\r
 \r
 # ======================================================\r
 #  Android camera helper macro\r