third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cmake(android): update zlib alias condition

Browse Source 
To use 'z' in Android.mk instead of absolute path from the build machine.
This commit is contained in:
Alexander Alekhin 2018-01-05 03:53:00 +00:00
parent bc7923e382
commit 0e6dd32858
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/OpenCVFindLibsGrfmt.cmake
View File

@ -8,8 +8,7 @@ if(BUILD_ZLIB)
else()
find_package(ZLIB "${MIN_VER_ZLIB}")
if(ZLIB_FOUND AND ANDROID)
if(ZLIB_LIBRARIES STREQUAL "${ANDROID_SYSROOT}/usr/lib/libz.so" OR
ZLIB_LIBRARIES STREQUAL "${ANDROID_SYSROOT}/usr/lib64/libz.so")
if(ZLIB_LIBRARIES MATCHES "/usr/(lib|lib32|lib64)/libz.so$")
set(ZLIB_LIBRARIES z)
endif()
endif()