third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

android: set all zlib variables used by downstream packages

Browse Source
This commit is contained in:
Stefan Dragnev 2022-01-24 13:52:23 +01:00
parent 574320ec3f
commit 2e20f2b89f
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/OpenCVFindLibsGrfmt.cmake
View File

@ -17,8 +17,10 @@ else()
unset(_zlib_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES) unset(_zlib_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES)
endif() endif()
if(ZLIB_FOUND AND ANDROID) if(ZLIB_FOUND AND ANDROID)
if(ZLIB_LIBRARIES MATCHES "/usr/lib.*/libz.so$") if(ZLIB_LIBRARY MATCHES "/usr/lib.*/libz.so$")
set(ZLIB_LIBRARY z)
set(ZLIB_LIBRARIES z) set(ZLIB_LIBRARIES z)
set(ZLIB_LIBRARY_RELEASE z)
endif() endif()
endif() endif()
endif() endif()