OSSForks/opencv
1
0
Fork 0
mirror of https://github.com/zebrajr/opencv.git synced 2025-12-06 12:19:50 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #21508 from tailsu:sd/fix-zlib-png-android

Browse Source
This commit is contained in:
Alexander Alekhin 2022-01-31 17:51:23 +00:00
commit 6811d3d80b
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)
endif()
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_LIBRARY_RELEASE z)
endif()
endif()
endif()