mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-05-13 11:06:23 +02:00
49294ffa90
Release Notes: https://cmake.org/cmake/help/v3.26/release/3.26.html Signed-off-by: Linhui Liu <liulinhui36@gmail.com>
21 lines
717 B
Diff
21 lines
717 B
Diff
--- 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)
|