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

brining over fix in master (#4140) for libz import on 64-bit android

Browse Source 
(cherry picked from commit 55a9fdf051)
This commit is contained in:
Aaron Simmons
2015-10-13 17:42:40 -06:00
committed by Alexander Smorkalov
parent 2d3e170370
commit ca50969c2b
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/OpenCVFindLibsGrfmt.cmake
View File

@@ -8,7 +8,8 @@ if(BUILD_ZLIB)
else()
include(FindZLIB)
if(ZLIB_FOUND AND ANDROID)
if(ZLIB_LIBRARY STREQUAL "${ANDROID_SYSROOT}/usr/lib/libz.so")
if(ZLIB_LIBRARIES STREQUAL "${ANDROID_SYSROOT}/usr/lib/libz.so" OR
ZLIB_LIBRARIES STREQUAL "${ANDROID_SYSROOT}/usr/lib64/libz.so")
set(ZLIB_LIBRARY z)
set(ZLIB_LIBRARIES z)
endif()