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

make OpenCVConfig.cmake usable in the case of static libs

Browse Source
This commit is contained in:
Vadim Pisarevsky
2010-12-04 23:02:36 +00:00
parent 3ec6934da3
commit 8b4cb1d99c
7 changed files with 47 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/CMakeLists.txt
View File

@@ -1,3 +1,3 @@
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/include")
set(deps opencv_lapack zlib)
set(deps opencv_lapack opencv_zlib)
define_opencv_module(core ${deps})

8
modules/highgui/CMakeLists.txt
View File

@@ -277,8 +277,8 @@ if(WITH_JPEG AND NOT JPEG_FOUND)
endif()
if(WITH_PNG AND NOT PNG_FOUND)
add_dependencies(${the_target} libpng zlib)
target_link_libraries(${the_target} libpng zlib)
add_dependencies(${the_target} libpng opencv_zlib)
target_link_libraries(${the_target} libpng opencv_zlib)
endif()
if(WITH_TIFF AND NOT TIFF_FOUND)
@@ -287,8 +287,8 @@ if(WITH_TIFF AND NOT TIFF_FOUND)
endif()
#if(OPENCV_BUILD_3RDPARTY_LIBS)
# add_dependencies(${the_target} libjasper libjpeg libpng libtiff zlib)
# target_link_libraries(${the_target} libjasper libjpeg libpng libtiff zlib)
# add_dependencies(${the_target} libjasper libjpeg libpng libtiff opencv_zlib)
# target_link_libraries(${the_target} libjasper libjpeg libpng libtiff opencv_zlib)
#endif()
if(WIN32)
target_link_libraries(${the_target} comctl32 gdi32 ole32)