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

2015-10-13 17:42:40 -06:00
parent 8b23d1ec64
commit 55a9fdf051
1 changed files with 2 additions and 1 deletions
--- a/cmake/OpenCVFindLibsGrfmt.cmake
+++ b/cmake/OpenCVFindLibsGrfmt.cmake
@@ -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()