From 4f262d566f74aef25cbb4fcc8633ebe01040af44 Mon Sep 17 00:00:00 2001 From: Tom Dewey Date: Wed, 4 Sep 2024 13:28:50 +0100 Subject: [PATCH] deps: libarchive: Remove standalone FindZstd --- src/dependencies/curl-8.8.0/Makefile.am | 1 - src/dependencies/curl-8.8.0/Makefile.in | 1 - src/dependencies/libarchive-3.7.4/CMakeLists.txt | 14 +++++++------- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/dependencies/curl-8.8.0/Makefile.am b/src/dependencies/curl-8.8.0/Makefile.am index ad8651c..57686d3 100644 --- a/src/dependencies/curl-8.8.0/Makefile.am +++ b/src/dependencies/curl-8.8.0/Makefile.am @@ -45,7 +45,6 @@ CMAKE_DIST = \ CMake/FindNGTCP2.cmake \ CMake/FindQUICHE.cmake \ CMake/FindWolfSSL.cmake \ - CMake/FindZstd.cmake \ CMake/Macros.cmake \ CMake/OtherTests.cmake \ CMake/PickyWarnings.cmake \ diff --git a/src/dependencies/curl-8.8.0/Makefile.in b/src/dependencies/curl-8.8.0/Makefile.in index fcd79bf..6ff52e1 100644 --- a/src/dependencies/curl-8.8.0/Makefile.in +++ b/src/dependencies/curl-8.8.0/Makefile.in @@ -581,7 +581,6 @@ CMAKE_DIST = \ CMake/FindNGTCP2.cmake \ CMake/FindQUICHE.cmake \ CMake/FindWolfSSL.cmake \ - CMake/FindZstd.cmake \ CMake/Macros.cmake \ CMake/OtherTests.cmake \ CMake/PickyWarnings.cmake \ diff --git a/src/dependencies/libarchive-3.7.4/CMakeLists.txt b/src/dependencies/libarchive-3.7.4/CMakeLists.txt index 59daf29..47404ef 100644 --- a/src/dependencies/libarchive-3.7.4/CMakeLists.txt +++ b/src/dependencies/libarchive-3.7.4/CMakeLists.txt @@ -647,19 +647,19 @@ IF(ARCHIVE_ENABLE_ZSTD) 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 libzstd HINTS ${PC_ZSTD_LIBDIR} ${PC_ZSTD_LIBRARY_DIRS}) - INCLUDE(FindPackageHandleStandardArgs) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZSTD DEFAULT_MSG ZSTD_LIBRARY ZSTD_INCLUDE_DIR) + # FIND_PATH(ZSTD_INCLUDE_DIR zstd.h HINTS ${PC_ZSTD_INCLUDEDIR} ${PC_ZSTD_INCLUDE_DIRS}) + # FIND_LIBRARY(ZSTD_LIBRARY NAMES zstd libzstd HINTS ${PC_ZSTD_LIBDIR} ${PC_ZSTD_LIBRARY_DIRS}) + # INCLUDE(FindPackageHandleStandardArgs) + # FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZSTD DEFAULT_MSG ZSTD_LIBRARY ZSTD_INCLUDE_DIR) ELSE(ARCHIVE_ENABLE_ZSTD) SET(ZSTD_FOUND FALSE) # Override cached value ENDIF(ARCHIVE_ENABLE_ZSTD) IF(ZSTD_FOUND) SET(HAVE_ZSTD_H 1) INCLUDE_DIRECTORIES(${ZSTD_INCLUDE_DIR}) - LIST(APPEND ADDITIONAL_LIBS ${ZSTD_LIBRARY}) + LIST(APPEND ADDITIONAL_LIBS ${ZSTD_LIBRARIES}) CMAKE_PUSH_CHECK_STATE() - SET(CMAKE_REQUIRED_LIBRARIES ${ZSTD_LIBRARY}) + SET(CMAKE_REQUIRED_LIBRARIES ${ZSTD_LIBRARIES}) SET(CMAKE_REQUIRED_INCLUDES ${ZSTD_INCLUDE_DIR}) CHECK_FUNCTION_EXISTS(ZSTD_decompressStream HAVE_LIBZSTD) CHECK_FUNCTION_EXISTS(ZSTD_compressStream HAVE_ZSTD_compressStream) @@ -669,7 +669,7 @@ IF(ZSTD_FOUND) CMAKE_POP_CHECK_STATE() ENDIF(ZSTD_FOUND) MARK_AS_ADVANCED(CLEAR ZSTD_INCLUDE_DIR) -MARK_AS_ADVANCED(CLEAR ZSTD_LIBRARY) +MARK_AS_ADVANCED(CLEAR ZSTD_LIBRARIES) #