mirror of
https://github.com/Kitware/CMake.git
synced 2025-10-14 02:08:27 +08:00
Merge topic 'FindZLIB-static'
b2c059e68f
FindZLIB: Find static libraries from upstream zlib's cmake-based build
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11291
This commit is contained in:
@@ -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)
|
||||
|
Reference in New Issue
Block a user