From: Vadim Pisarevsky <no@email>
Date: Tue, 21 Jun 2011 11:10:45 +0000 (+0000)
Subject: fix for ticket #1153 propagated to trunk
X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~6891
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=677d2e508fd53908b68c169a386e3c81c3b86fce;p=platform%2Fupstream%2Fopencv.git

fix for ticket #1153 propagated to trunk
---

diff --git a/OpenCVConfig.cmake.in b/OpenCVConfig.cmake.in
index 8c6948e..7234be2 100644
--- a/OpenCVConfig.cmake.in
+++ b/OpenCVConfig.cmake.in
@@ -89,7 +89,9 @@ endif(NOT @CMAKE_BASE_INCLUDE_DIRS_CONFIGCMAKE@ STREQUAL  "")
 
 # For OpenCV built as static libs, we need the user to link against
 #  many more dependencies:
-IF (NOT @BUILD_SHARED_LIBS@)
+set(OpenCV_SHARED @BUILD_SHARED_LIBS@)
+
+IF (NOT OpenCV_SHARED)
     # Under static libs, the user of OpenCV needs access to the 3rdparty libs as well:
     if(WIN32 AND NOT ANDROID)
         LINK_DIRECTORIES(@CMAKE_BASE_INCLUDE_DIRS_CONFIGCMAKE@/3rdparty/lib)
@@ -111,7 +113,7 @@ IF (NOT @BUILD_SHARED_LIBS@)
         set(OpenCV_LIBS ${OpenCV_LIBS} ${OPENCV_EXTRA_COMPONENTS})
     endif(CMAKE_MAJOR_VERSION GREATER 2  OR  CMAKE_MINOR_VERSION GREATER 4)
 
-ENDIF(NOT @BUILD_SHARED_LIBS@)
+ENDIF()
 
 # ======================================================
 #  Android camera helper macro