qiurui
/
openwrt
mirror of https://git.openwrt.org/openwrt/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
openwrt/tools/cmake/patches/150-zstd-libarchive.patch

12 lines
410 B
Diff
Raw Normal View History

tools/cmake: fix compilation with host libzstd-dev cmake's find_package looks at host paths first for some reason. Switch to using pkgconfig for the search, matching other modules. Fixes: 3848cf458ef9 ("tools/cmake: Build without some included libs") Signed-off-by: Rosen Penev <rosenp@gmail.com>
2022-09-30 08:42:51 +00:00
--- a/Utilities/cmlibarchive/CMakeLists.txt
+++ b/Utilities/cmlibarchive/CMakeLists.txt
tools/cmake: update to 3.29.0 Changelog: - https://www.kitware.com/cmake-3-29-0-available-for-download/ Refresh patches: - 120-curl-fix-libressl-linking.patch - 130-bootstrap_parallel_make_flag.patch - 150-zstd-libarchive.patch Signed-off-by: Nick Hainke <vincent@systemli.org>
2024-03-29 06:18:07 +00:00
@@ -656,7 +656,7 @@ IF(ENABLE_ZSTD)
tools/cmake: fix compilation with host libzstd-dev cmake's find_package looks at host paths first for some reason. Switch to using pkgconfig for the search, matching other modules. Fixes: 3848cf458ef9 ("tools/cmake: Build without some included libs") Signed-off-by: Rosen Penev <rosenp@gmail.com>
2022-09-30 08:42:51 +00:00
SET(ZSTD_FIND_QUIETLY TRUE)
ENDIF (ZSTD_INCLUDE_DIR)
tools/cmake: update to 3.27.1 Fix zstd linking again. Signed-off-by: Rosen Penev <rosenp@gmail.com>
2023-08-02 00:56:00 +00:00
- IF(0) # CMake does not let pkg-config override its search paths.
+ IF(1) # CMake does not let pkg-config override its search paths.
IF(UNIX)
FIND_PACKAGE(PkgConfig QUIET)
PKG_SEARCH_MODULE(PC_ZSTD libzstd)