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

opencv_zlib renamed back to zlib; make static libs work on Windows

Browse Source
This commit is contained in:
Vadim Pisarevsky
2010-12-05 01:19:36 +00:00
parent 8b4cb1d99c
commit 0de9c9fd3c
13 changed files with 86 additions and 63 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 opencv_zlib)
set(deps opencv_lapack zlib)
define_opencv_module(core ${deps})

37
modules/highgui/CMakeLists.txt
View File

@@ -264,53 +264,28 @@ endif(MSVC)
add_dependencies(${the_target} opencv_core opencv_imgproc)
# Add the required libraries for linking:
target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} opencv_core opencv_imgproc ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${TIFF_LIBRARIES} ${JASPER_LIBRARIES} ${HIGHGUI_LIBRARIES} ${OPENEXR_LIBRARIES})
if(WITH_JASPER AND NOT JASPER_FOUND)
add_dependencies(${the_target} libjasper)
target_link_libraries(${the_target} libjasper)
#target_link_libraries(${the_target} libjasper)
endif()
if(WITH_JPEG AND NOT JPEG_FOUND)
add_dependencies(${the_target} libjpeg)
target_link_libraries(${the_target} libjpeg)
#target_link_libraries(${the_target} libjpeg)
endif()
if(WITH_PNG AND NOT PNG_FOUND)
add_dependencies(${the_target} libpng opencv_zlib)
target_link_libraries(${the_target} libpng opencv_zlib)
add_dependencies(${the_target} libpng zlib)
#target_link_libraries(${the_target} libpng zlib)
endif()
if(WITH_TIFF AND NOT TIFF_FOUND)
add_dependencies(${the_target} libtiff)
target_link_libraries(${the_target} libtiff)
#target_link_libraries(${the_target} libtiff)
endif()
#if(OPENCV_BUILD_3RDPARTY_LIBS)
# 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)
if (MSVC)
target_link_libraries(${the_target} vfw32)
endif()
if(MINGW)
if(MINGW64)
target_link_libraries(${the_target} msvfw32 avifil32 avicap32 winmm)
if(HAVE_VIDEOINPUT)
target_link_libraries(${the_target} videoInput64 strmiids)
endif()
else()
target_link_libraries(${the_target} vfw32 winmm)
if(HAVE_VIDEOINPUT)
target_link_libraries(${the_target} videoInput strmiids)
endif()
endif()
endif()
endif()
target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} opencv_core opencv_imgproc zlib ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${TIFF_LIBRARIES} ${JASPER_LIBRARIES} ${HIGHGUI_LIBRARIES} ${OPENEXR_LIBRARIES})
if(APPLE)
target_link_libraries(${the_target} "-lbz2 -framework Cocoa -framework QuartzCore")