mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2026-02-08 16:50:42 +01:00
9ba24e0ee9
Update cmake to version 4.2.0 Release notes at https://cmake.org/cmake/help/v4.2/release/4.2.html Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi> Link: https://github.com/openwrt/openwrt/pull/20863 Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
20 lines
717 B
Diff
20 lines
717 B
Diff
--- a/Modules/FindZLIB.cmake
|
|
+++ b/Modules/FindZLIB.cmake
|
|
@@ -160,10 +160,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)
|