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

98c26d95 · Alexander Alekhin · bd34f6dd · 55a9fdf0 · 98c26d95
Commit 98c26d95 authored Oct 14, 2015 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

OpenCVFindLibsGrfmt.cmake cmake/OpenCVFindLibsGrfmt.cmake +2 -1

No files found.
--- 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()