cmclark00/retro-imager
1
0
Fork 0
mirror of https://github.com/cmclark00/retro-imager.git synced 2025-05-18 07:55:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

deps: libarchive: Remove standalone FindZstd

Browse source
This commit is contained in:
Tom Dewey 2024-09-04 13:28:50 +01:00 • committed by Tom Dewey
parent 676228f3a1
commit 4f262d566f
3 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/dependencies/curl-8.8.0/Makefile.am
View file

@ -45,7 +45,6 @@ CMAKE_DIST = \
CMake/FindNGTCP2.cmake \ CMake/FindNGTCP2.cmake \
CMake/FindQUICHE.cmake \ CMake/FindQUICHE.cmake \
CMake/FindWolfSSL.cmake \ CMake/FindWolfSSL.cmake \
CMake/FindZstd.cmake \
CMake/Macros.cmake \ CMake/Macros.cmake \
CMake/OtherTests.cmake \ CMake/OtherTests.cmake \
CMake/PickyWarnings.cmake \ CMake/PickyWarnings.cmake \

1
src/dependencies/curl-8.8.0/Makefile.in
View file

@ -581,7 +581,6 @@ CMAKE_DIST = \
CMake/FindNGTCP2.cmake \ CMake/FindNGTCP2.cmake \
CMake/FindQUICHE.cmake \ CMake/FindQUICHE.cmake \
CMake/FindWolfSSL.cmake \ CMake/FindWolfSSL.cmake \
CMake/FindZstd.cmake \
CMake/Macros.cmake \ CMake/Macros.cmake \
CMake/OtherTests.cmake \ CMake/OtherTests.cmake \
CMake/PickyWarnings.cmake \ CMake/PickyWarnings.cmake \

14
src/dependencies/libarchive-3.7.4/CMakeLists.txt
View file

@ -647,19 +647,19 @@ IF(ARCHIVE_ENABLE_ZSTD)
PKG_SEARCH_MODULE(PC_ZSTD libzstd) PKG_SEARCH_MODULE(PC_ZSTD libzstd)
ENDIF() ENDIF()
FIND_PATH(ZSTD_INCLUDE_DIR zstd.h HINTS ${PC_ZSTD_INCLUDEDIR} ${PC_ZSTD_INCLUDE_DIRS}) # 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}) # FIND_LIBRARY(ZSTD_LIBRARY NAMES zstd libzstd HINTS ${PC_ZSTD_LIBDIR} ${PC_ZSTD_LIBRARY_DIRS})
INCLUDE(FindPackageHandleStandardArgs) # INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZSTD DEFAULT_MSG ZSTD_LIBRARY ZSTD_INCLUDE_DIR) # FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZSTD DEFAULT_MSG ZSTD_LIBRARY ZSTD_INCLUDE_DIR)
ELSE(ARCHIVE_ENABLE_ZSTD) ELSE(ARCHIVE_ENABLE_ZSTD)
SET(ZSTD_FOUND FALSE) # Override cached value SET(ZSTD_FOUND FALSE) # Override cached value
ENDIF(ARCHIVE_ENABLE_ZSTD) ENDIF(ARCHIVE_ENABLE_ZSTD)
IF(ZSTD_FOUND) IF(ZSTD_FOUND)
SET(HAVE_ZSTD_H 1) SET(HAVE_ZSTD_H 1)
INCLUDE_DIRECTORIES(${ZSTD_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${ZSTD_INCLUDE_DIR})
LIST(APPEND ADDITIONAL_LIBS ${ZSTD_LIBRARY}) LIST(APPEND ADDITIONAL_LIBS ${ZSTD_LIBRARIES})
CMAKE_PUSH_CHECK_STATE() CMAKE_PUSH_CHECK_STATE()
SET(CMAKE_REQUIRED_LIBRARIES ${ZSTD_LIBRARY}) SET(CMAKE_REQUIRED_LIBRARIES ${ZSTD_LIBRARIES})
SET(CMAKE_REQUIRED_INCLUDES ${ZSTD_INCLUDE_DIR}) SET(CMAKE_REQUIRED_INCLUDES ${ZSTD_INCLUDE_DIR})
CHECK_FUNCTION_EXISTS(ZSTD_decompressStream HAVE_LIBZSTD) CHECK_FUNCTION_EXISTS(ZSTD_decompressStream HAVE_LIBZSTD)
CHECK_FUNCTION_EXISTS(ZSTD_compressStream HAVE_ZSTD_compressStream) CHECK_FUNCTION_EXISTS(ZSTD_compressStream HAVE_ZSTD_compressStream)
@ -669,7 +669,7 @@ IF(ZSTD_FOUND)
CMAKE_POP_CHECK_STATE() CMAKE_POP_CHECK_STATE()
ENDIF(ZSTD_FOUND) ENDIF(ZSTD_FOUND)
MARK_AS_ADVANCED(CLEAR ZSTD_INCLUDE_DIR) MARK_AS_ADVANCED(CLEAR ZSTD_INCLUDE_DIR)
MARK_AS_ADVANCED(CLEAR ZSTD_LIBRARY) MARK_AS_ADVANCED(CLEAR ZSTD_LIBRARIES)
# #