Fixing TBB search and zlib version detection

2012-04-09 13:47:30 +00:00
parent 75ad9b9867
commit c208b58e6b
2 changed files with 4 additions and 1 deletions
--- a/cmake/OpenCVIOLibs.cmake
+++ b/cmake/OpenCVIOLibs.cmake
@@ -16,6 +16,9 @@ else()
    ocv_parse_header2(ZLIB "${ANDROID_SYSROOT}/usr/include/zlib.h" ZLIB_VERSION "")
  else()
    include(FindZLIB)
+    if(NOT ZLIB_VERSION_STRING)
+      ocv_parse_header2(ZLIB "${ZLIB_INCLUDE_DIR}/zlib.h" ZLIB_VERSION "")
+    endif()
  endif()
 endif()