diff options
| author | Brad King <brad.king@kitware.com> | 2018-02-20 16:42:07 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-02-20 16:42:23 (GMT) |
| commit | 3bc3762c7c54ba0280413b3782473e078e1b00c8 (patch) | |
| tree | 65cdf1d4df03c031695933399aee9a87f68d970b | |
| parent | 1fbd5f4a7eb97137df8aec9e02bf61305efd415b (diff) | |
| parent | c01eede89474ffb1e52595138b18b080e655a46c (diff) | |
| download | CMake-3bc3762c7c54ba0280413b3782473e078e1b00c8.zip CMake-3bc3762c7c54ba0280413b3782473e078e1b00c8.tar.gz CMake-3bc3762c7c54ba0280413b3782473e078e1b00c8.tar.bz2 | |
Merge topic 'findzlib-folder-priority'
c01eede8 FindZLIB: Search names per directory
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1769
| -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 4065999..a5c04ac 100644 --- a/Modules/FindZLIB.cmake +++ b/Modules/FindZLIB.cmake @@ -75,8 +75,8 @@ endforeach() # Allow ZLIB_LIBRARY to be set manually, as the location of the zlib library if(NOT ZLIB_LIBRARY) foreach(search ${_ZLIB_SEARCHES}) - find_library(ZLIB_LIBRARY_RELEASE NAMES ${ZLIB_NAMES} ${${search}} PATH_SUFFIXES lib) - find_library(ZLIB_LIBRARY_DEBUG NAMES ${ZLIB_NAMES_DEBUG} ${${search}} PATH_SUFFIXES lib) + find_library(ZLIB_LIBRARY_RELEASE NAMES ${ZLIB_NAMES} NAMES_PER_DIR ${${search}} PATH_SUFFIXES lib) + find_library(ZLIB_LIBRARY_DEBUG NAMES ${ZLIB_NAMES_DEBUG} NAMES_PER_DIR ${${search}} PATH_SUFFIXES lib) endforeach() include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake) |