Set minimal zlib version to 1.2.3.

Rationale: 1.2.3 was a security update, and we should avoid using
versions with known security vulnerabilities.

diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake
index ea970edcc7d1fac0577e79203c29be18787ad251..7d885f7a7adeb0db89066c0717a33ad075122456 100644 (file)
--- a/cmake/OpenCVFindLibsGrfmt.cmake
+++ b/cmake/OpenCVFindLibsGrfmt.cmake
@@ -6,7 +6,7 @@
 if(BUILD_ZLIB)
   ocv_clear_vars(ZLIB_FOUND)
 else()
-  include(FindZLIB)
+  find_package(ZLIB "${MIN_VER_ZLIB}")
   if(ZLIB_FOUND AND ANDROID)
     if(ZLIB_LIBRARIES STREQUAL "${ANDROID_SYSROOT}/usr/lib/libz.so")
       set(ZLIB_LIBRARIES z)

diff --git a/cmake/OpenCVMinDepVersions.cmake b/cmake/OpenCVMinDepVersions.cmake
index 93ae5ebf6c4c1598b1e4842f1891967f2c20fa2c..9ec40d963af9c4ac10685452295c0972b301467e 100644 (file)
--- a/cmake/OpenCVMinDepVersions.cmake
+++ b/cmake/OpenCVMinDepVersions.cmake
@@ -1 +1,2 @@
 set(MIN_VER_CMAKE 2.8.7)
+set(MIN_VER_ZLIB 1.2.3)