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

Android: renamed default library name for static and dynamic fallback load; fixed libz import for 64-bit platforms

Browse Source
This commit is contained in:
Maksim Shabunin
2015-06-19 18:53:45 +03:00
parent 59ed7d06bf
commit 83b2621de4
3 changed files with 4 additions and 3 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()
find_package(ZLIB "${MIN_VER_ZLIB}")
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" OR
ZLIB_LIBRARIES STREQUAL "${ANDROID_SYSROOT}/usr/lib64/libz.so")
set(ZLIB_LIBRARIES z)
endif()
endif()