moved image codecs' headers to the respective subdirectories; allow the user to use system zlib.

2011-04-26 15:46:15 +00:00
parent 0e0929af15
commit 6985540744
41 changed files with 1603 additions and 8454 deletions
--- a/modules/core/CMakeLists.txt
+++ b/modules/core/CMakeLists.txt
@@ -1,3 +1,8 @@
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/include")
-set(deps zlib)
+if(ZLIB_FOUND)
+    include_directories(${ZLIB_INCUDE_DIR})
+    set(deps ${ZLIB_LIBRARIES})
+else()
+    include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/zlib")
+    set(deps zlib)
+endif()
 define_opencv_module(core ${deps})