Merge topic 'FindZLIB-static'

b2c059e68f FindZLIB: Find static libraries from upstream zlib's cmake-based build

Acked-by: Kitware Robot <[email protected]>
Merge-request: !11291

Modules/FindZLIB.cmake

@@ -153,8 +153,8 @@ unset(_ZLIB_x86)
 list(APPEND _ZLIB_SEARCHES _ZLIB_SEARCH_NORMAL)
 
 if(ZLIB_USE_STATIC_LIBS)
-  set(ZLIB_NAMES zlibstatic zlibstat zlib z)
-  set(ZLIB_NAMES_DEBUG zlibstaticd zlibstatd zlibd zd)
+  set(ZLIB_NAMES zs zlibstatic zlibstat zlib z)
+  set(ZLIB_NAMES_DEBUG zsd zlibstaticd zlibstatd zlibd zd)
 else()
   set(ZLIB_NAMES z zlib zdll zlib1 zlibstatic zlibwapi zlibvc zlibstat)
   set(ZLIB_NAMES_DEBUG zd zlibd zdlld zlibd1 zlib1d zlibstaticd zlibwapid zlibvcd zlibstatd)