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

Merge pull request #5511 from paleozogt:android-64-bit

Browse Source
This commit is contained in:
Alexander Alekhin 2015-10-14 11:35:04 +00:00
commit 98c26d95e5
1 changed files with 2 additions and 1 deletions
Show Stats 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() else()
include(FindZLIB) include(FindZLIB)
if(ZLIB_FOUND AND ANDROID) 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_LIBRARY z)
set(ZLIB_LIBRARIES z) set(ZLIB_LIBRARIES z)
endif() endif()