From 55a9fdf0512a6bd3fd82591f48db0942cbd4fc38 Mon Sep 17 00:00:00 2001 From: Aaron Simmons Date: Tue, 13 Oct 2015 17:42:40 -0600 Subject: [PATCH] brining over fix in master (#4140) for libz import on 64-bit android --- cmake/OpenCVFindLibsGrfmt.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake index f27a302ab7..43c3b16cc1 100644 --- 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() -- GitLab