summaryrefslogtreecommitdiff
path: root/Utilities/cmlibarchive
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2022-02-15 13:10:59 -0500
committerBrad King <brad.king@kitware.com>2022-02-16 07:41:50 -0500
commit4a7a5718c62ad639097a327bd08a85cdf0b35ce1 (patch)
treebd84ed5ca4c95be22efc18966a7144aeb45dca08 /Utilities/cmlibarchive
parent85cdeefc37be94b76d6cd630cd2b40e9b04db2bc (diff)
downloadcmake-4a7a5718c62ad639097a327bd08a85cdf0b35ce1.tar.gz
libarchive: Update build within CMake after changes in 3.6.0
Diffstat (limited to 'Utilities/cmlibarchive')
-rw-r--r--Utilities/cmlibarchive/CMakeLists.txt1
-rw-r--r--Utilities/cmlibarchive/libarchive/archive_read_support_format_zip.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt
index 932279b36c..17921f3e95 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 7e993676d2..8ad73b6cc5 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"