tools/cmake: update to 3.27.1

[openwrt/staging/jow.git] / tools / cmake / patches / 150-zstd-libarchive.patch

diff --git a/tools/cmake/patches/150-zstd-libarchive.patch b/tools/cmake/patches/150-zstd-libarchive.patch
index 34f7240fe41703d5c6f463d6c4848971d7f45e59..4ed099fbfebdcc46b2b7b069a08c485e0026c03b 100644 (file)
--- a/tools/cmake/patches/150-zstd-libarchive.patch
+++ b/tools/cmake/patches/150-zstd-libarchive.patch
@@ -1,18 +1,11 @@
 --- a/Utilities/cmlibarchive/CMakeLists.txt
 +++ b/Utilities/cmlibarchive/CMakeLists.txt
-@@ -632,8 +632,13 @@ IF(ENABLE_ZSTD)
+@@ -636,7 +636,7 @@ IF(ENABLE_ZSTD)
      SET(ZSTD_FIND_QUIETLY TRUE)
    ENDIF (ZSTD_INCLUDE_DIR)
  
--  FIND_PATH(ZSTD_INCLUDE_DIR zstd.h)
--  FIND_LIBRARY(ZSTD_LIBRARY NAMES zstd libzstd)
-+  IF(UNIX)
-+  FIND_PACKAGE(PkgConfig QUIET)
-+  PKG_SEARCH_MODULE(PC_ZSTD libzstd)
-+  ENDIF()
-+
-+  FIND_PATH(ZSTD_INCLUDE_DIR zstd.h HINTS ${PC_ZSTD_INCLUDEDIR} ${PC_ZSTD_INCLUDE_DIRS})
-+  FIND_LIBRARY(ZSTD_LIBRARY NAMES zstd HINTS ${PC_ZSTD_LIBDIR} ${PC_ZSTD_LIBRARY_DIRS})
-   INCLUDE(FindPackageHandleStandardArgs)
-   FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZSTD DEFAULT_MSG ZSTD_LIBRARY ZSTD_INCLUDE_DIR)
- ELSE(ENABLE_ZSTD)
+-  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)