diff options
| author | Brad King <brad.king@kitware.com> | 2019-05-29 13:18:27 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-05-29 13:19:38 (GMT) |
| commit | 8b42d560028b8da0a3cf7e1a14962f2245d21227 (patch) | |
| tree | da04bc995c1c79db5e63136265ce75c7b6384c8c | |
| parent | 5a720a30fad4cb7dc4b9d9b783a7d3a8a9a1b231 (diff) | |
| parent | 4ff3ab2ac9d0c81c927d25117e5a14cb8ebbbb86 (diff) | |
| download | CMake-8b42d560028b8da0a3cf7e1a14962f2245d21227.zip CMake-8b42d560028b8da0a3cf7e1a14962f2245d21227.tar.gz CMake-8b42d560028b8da0a3cf7e1a14962f2245d21227.tar.bz2 | |
Merge topic 'FindZLIB-names'
4ff3ab2ac9 FindZLIB: Add more zlib library names
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3384
| -rw-r--r-- | Modules/FindZLIB.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/FindZLIB.cmake b/Modules/FindZLIB.cmake index 790eb42..79e2313 100644 --- a/Modules/FindZLIB.cmake +++ b/Modules/FindZLIB.cmake @@ -67,8 +67,8 @@ set(_ZLIB_SEARCH_NORMAL unset(_ZLIB_x86) list(APPEND _ZLIB_SEARCHES _ZLIB_SEARCH_NORMAL) -set(ZLIB_NAMES z zlib zdll zlib1) -set(ZLIB_NAMES_DEBUG zlibd zlibd1) +set(ZLIB_NAMES z zlib zdll zlib1 zlibstatic) +set(ZLIB_NAMES_DEBUG zd zlibd zdlld zlibd1 zlib1d zlibstaticd) # Try each search configuration. foreach(search ${_ZLIB_SEARCHES}) |