| 1234567891011121314151617181920 |
- --- a/Modules/FindZLIB.cmake
- +++ b/Modules/FindZLIB.cmake
- @@ -117,10 +117,13 @@ else()
- set(ZLIB_NAMES_DEBUG zd zlibd zdlld zlibd1 zlib1d zlibstaticd zlibwapid zlibvcd zlibstatd)
- endif()
-
- -# Try each search configuration.
- -foreach(search ${_ZLIB_SEARCHES})
- - find_path(ZLIB_INCLUDE_DIR NAMES zlib.h ${${search}} PATH_SUFFIXES include)
- -endforeach()
- +if(UNIX)
- + find_package(PkgConfig QUIET)
- + pkg_search_module(PC_zlib zlib)
- +endif()
- +
- +find_path(ZLIB_INCLUDE_DIR zlib.h HINTS ${PC_zlib_INCLUDEDIR} ${PC_zlib_INCLUDE_DIRS})
- +find_library(ZLIB_LIBRARY NAMES z HINTS ${PC_zlib_LIBDIR} ${PC_zlib_LIBRARY_DIRS})
-
- # Allow ZLIB_LIBRARY to be set manually, as the location of the zlib library
- if(NOT ZLIB_LIBRARY)
|
