Fixing TBB search and zlib version detection

diff --git a/cmake/OpenCVDetectTBB.cmake b/cmake/OpenCVDetectTBB.cmake
index b194178..51ec34e 100644 (file)
--- a/cmake/OpenCVDetectTBB.cmake
+++ b/cmake/OpenCVDetectTBB.cmake
@@ -20,7 +20,7 @@ endif()
 if(NOT HAVE_TBB)
   set(TBB_DEFAULT_INCLUDE_DIRS "/opt/intel/tbb" "/usr/local/include" "/usr/include" "C:/Program Files/Intel/TBB" "C:/Program Files (x86)/Intel/TBB" "C:/Program Files (x86)/TBB" "${CMAKE_INSTALL_PREFIX}/include")
 
-  find_path(TBB_INCLUDE_DIRS "tbb/tbb.h" PATHS ${TBB_DEFAULT_INCLUDE_DIRS} DOC "The path to TBB headers")
+  find_path(TBB_INCLUDE_DIRS "tbb/tbb.h" PATHS ${TBB_INCLUDE_DIR} ${TBB_DEFAULT_INCLUDE_DIRS} DOC "The path to TBB headers")
   if(TBB_INCLUDE_DIRS)
     if(UNIX)
       set(TBB_LIB_DIR "${TBB_INCLUDE_DIRS}/../lib" CACHE PATH "Full path of TBB library directory")

diff --git a/cmake/OpenCVIOLibs.cmake b/cmake/OpenCVIOLibs.cmake
index e873c6b..36e36a7 100644 (file)
--- 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()