Commit 9c01a96b authored by Roman Donchenko's avatar Roman Donchenko

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.
parent 6fed0e85
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
if(BUILD_ZLIB) if(BUILD_ZLIB)
ocv_clear_vars(ZLIB_FOUND) ocv_clear_vars(ZLIB_FOUND)
else() else()
include(FindZLIB) find_package(ZLIB "${MIN_VER_ZLIB}")
if(ZLIB_FOUND AND ANDROID) if(ZLIB_FOUND AND ANDROID)
if(ZLIB_LIBRARIES STREQUAL "${ANDROID_SYSROOT}/usr/lib/libz.so") if(ZLIB_LIBRARIES STREQUAL "${ANDROID_SYSROOT}/usr/lib/libz.so")
set(ZLIB_LIBRARIES z) set(ZLIB_LIBRARIES z)
......
set(MIN_VER_CMAKE 2.8.7) set(MIN_VER_CMAKE 2.8.7)
set(MIN_VER_ZLIB 1.2.3)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment