forked from Openwrt/openwrt
1b48ebd31c
Update cmake to 4.1.2. Note that cmake 4.x requires at least 3.5 as 'cmake_minimum_required' in CMakeLists.txt of each app to be compiled. Future cmake versions will increase that requirement to 3.10 https://cmake.org/cmake/help/latest/command/cmake_minimum_required.html Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi> Link: https://github.com/openwrt/openwrt/pull/20265 Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
18 lines
764 B
Diff
18 lines
764 B
Diff
--- a/Modules/FindLibLZMA.cmake
|
|
+++ b/Modules/FindLibLZMA.cmake
|
|
@@ -82,7 +82,13 @@ Finding the liblzma library and linking
|
|
cmake_policy(PUSH)
|
|
cmake_policy(SET CMP0159 NEW) # file(STRINGS) with REGEX updates CMAKE_MATCH_<n>
|
|
|
|
-find_path(LIBLZMA_INCLUDE_DIR lzma.h )
|
|
+if(UNIX)
|
|
+ find_package(PkgConfig QUIET)
|
|
+ pkg_search_module(PC_liblzma liblzma)
|
|
+endif()
|
|
+
|
|
+find_path(LIBLZMA_INCLUDE_DIR lzma.h HINTS ${PC_liblzma_INCLUDEDIR} ${PC_liblzma_INCLUDE_DIRS})
|
|
+find_library(LIBLZMA_LIBRARY NAMES lzma HINTS ${PC_liblzma_LIBDIR} ${PC_liblzma_LIBRARY_DIRS})
|
|
if(NOT LIBLZMA_LIBRARY)
|
|
find_library(LIBLZMA_LIBRARY_RELEASE NAMES lzma liblzma NAMES_PER_DIR PATH_SUFFIXES lib)
|
|
find_library(LIBLZMA_LIBRARY_DEBUG NAMES lzmad liblzmad NAMES_PER_DIR PATH_SUFFIXES lib)
|