Merge pull request #21508

An error occurred

from tailsu:sd/fix-zlib-png-android

3 years ago · 6811d3d80b
parent 245f6273bd 2e20f2b89f
commit 6811d3d80b
1 changed files with 3 additions and 1 deletions
--- a/cmake/OpenCVFindLibsGrfmt.cmake
+++ b/cmake/OpenCVFindLibsGrfmt.cmake
@ -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()