Skip to content

O
opencv
Commit ca50969c authored by Aaron Simmons's avatar Aaron Simmons Committed by Alexander Smorkalov
Browse files
Options

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

(cherry picked from commit 55a9fdf0)
parent 2d3e1703
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
cmake/OpenCVFindLibsGrfmt.cmake
View file @ ca50969c
...@@ -8,7 +8,8 @@ if(BUILD_ZLIB) ...@@ -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()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment