generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Set minimal zlib version to 1.2.3.

Browse Source 
Rationale: 1.2.3 was a security update, and we should avoid using
versions with known security vulnerabilities.
This commit is contained in:
Roman Donchenko 2013-08-22 18:06:07 +04:00
parent 6fed0e85c2
commit 9c01a96b14
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/OpenCVFindLibsGrfmt.cmake
View File

@ -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)

1
cmake/OpenCVMinDepVersions.cmake
View File

@ -1 +1,2 @@
set(MIN_VER_CMAKE 2.8.7) set(MIN_VER_CMAKE 2.8.7)
set(MIN_VER_ZLIB 1.2.3)