From 2e20f2b89f1fedcea1ee82bbbe301612bf64a948 Mon Sep 17 00:00:00 2001 From: Stefan Dragnev Date: Mon, 24 Jan 2022 13:52:23 +0100 Subject: [PATCH] android: set all zlib variables used by downstream packages --- cmake/OpenCVFindLibsGrfmt.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake index 95d1d92f68..00886cc131 100644 --- 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()