diff options
| -rw-r--r-- | Utilities/cmThirdPartyChecks.cmake | 2 | ||||
| -rw-r--r-- | Utilities/cmlibarchive/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | Utilities/cmlibarchive/libarchive/archive_read_support_format_zip.c | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/Utilities/cmThirdPartyChecks.cmake b/Utilities/cmThirdPartyChecks.cmake index 7e38df9..c7b3c8a 100644 --- a/Utilities/cmThirdPartyChecks.cmake +++ b/Utilities/cmThirdPartyChecks.cmake @@ -118,6 +118,7 @@ if(WIN32) set(HAVE_LIBWS2_32 1) set(HAVE_LIMITS_H 1) set(HAVE_LINK 0) + set(HAVE_LINKAT 0) set(HAVE_LINUX_FIEMAP_H 0) set(HAVE_LINUX_FS_H 0) set(HAVE_LINUX_MAGIC_H 0) @@ -184,6 +185,7 @@ if(WIN32) set(HAVE_STROPTS_H 0) set(HAVE__STRTOI64 1) set(HAVE_STRTOLL 1) + set(HAVE_STRUCT_STATFS 0) set(HAVE_STRUCT_STATFS_F_NAMEMAX 0) set(HAVE_STRUCT_STAT_ST_BIRTHTIME 0) set(HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC 0) diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt index 932279b..17921f3 100644 --- a/Utilities/cmlibarchive/CMakeLists.txt +++ b/Utilities/cmlibarchive/CMakeLists.txt @@ -645,6 +645,7 @@ IF(ZSTD_FOUND) INCLUDE_DIRECTORIES(${ZSTD_INCLUDE_DIR}) LIST(APPEND ADDITIONAL_LIBS ${ZSTD_LIBRARY}) SET(HAVE_LIBZSTD 1) + SET(HAVE_LIBZSTD_COMPRESSOR 1) IF(0) # CMake expects the zstd library to work. CMAKE_PUSH_CHECK_STATE() SET(CMAKE_REQUIRED_LIBRARIES ${ZSTD_LIBRARY}) diff --git a/Utilities/cmlibarchive/libarchive/archive_read_support_format_zip.c b/Utilities/cmlibarchive/libarchive/archive_read_support_format_zip.c index 7e99367..8ad73b6 100644 --- a/Utilities/cmlibarchive/libarchive/archive_read_support_format_zip.c +++ b/Utilities/cmlibarchive/libarchive/archive_read_support_format_zip.c @@ -59,7 +59,7 @@ __FBSDID("$FreeBSD: head/lib/libarchive/archive_read_support_format_zip.c 201102 #include <cm3p/lzma.h> #endif #ifdef HAVE_ZSTD_H -#include <zstd.h> +#include <cm3p/zstd.h> #endif #include "archive.h" |