generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

removed OPENCV_BUILD_SHARED_LIB in favor of BUILD_SHARED_LIBS

Browse Source
This commit is contained in:
Alexander Shishkov
2011-05-31 13:17:59 +00:00
parent 926a6bba00
commit 6aabf72bc5
7 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenCVConfig.cmake.in
View File

@@ -86,7 +86,7 @@ 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 @OPENCV_BUILD_SHARED_LIB@)
IF (NOT @BUILD_SHARED_LIBS@)
# Under static libs, the user of OpenCV needs access to the 3rdparty libs as well:
LINK_DIRECTORIES(@CMAKE_LIB_DIRS_CONFIGCMAKE@/../3rdparty/lib)
if(WIN32)
@@ -112,7 +112,7 @@ IF (NOT @OPENCV_BUILD_SHARED_LIB@)
set(OpenCV_LIBS ${OpenCV_LIBS} ${OPENCV_EXTRA_COMPONENTS})
endif(CMAKE_MAJOR_VERSION GREATER 2 OR CMAKE_MINOR_VERSION GREATER 4)
ENDIF(NOT @OPENCV_BUILD_SHARED_LIB@)
ENDIF(NOT @BUILD_SHARED_LIBS@)
# ======================================================