diff options
| author | Brad King <brad.king@kitware.com> | 2020-02-13 15:11:54 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-02-13 17:59:29 (GMT) |
| commit | b83d96f164f158fd4d72ae8f67c1311a9bebd272 (patch) | |
| tree | fe99813d44903987c015ed178a2a19a6a331d8f5 /Utilities/cmlibarchive/libarchive | |
| parent | 5d8b3aec0cb8652ae867ff08d2e7bfa2060138dd (diff) | |
| download | CMake-b83d96f164f158fd4d72ae8f67c1311a9bebd272.zip CMake-b83d96f164f158fd4d72ae8f67c1311a9bebd272.tar.gz CMake-b83d96f164f158fd4d72ae8f67c1311a9bebd272.tar.bz2 | |
libarchive: Update to build within CMake
Hard-code more libarchive options as internal cache entries. Doing so
makes some of our `IF(0)` conditions unnecessary, so remove those.
Diffstat (limited to 'Utilities/cmlibarchive/libarchive')
| -rw-r--r-- | Utilities/cmlibarchive/libarchive/archive_getdate.c | 2 | ||||
| -rw-r--r-- | Utilities/cmlibarchive/libarchive/archive_read_support_format_rar5.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Utilities/cmlibarchive/libarchive/archive_getdate.c b/Utilities/cmlibarchive/libarchive/archive_getdate.c index 3ec5bba..6786d35 100644 --- a/Utilities/cmlibarchive/libarchive/archive_getdate.c +++ b/Utilities/cmlibarchive/libarchive/archive_getdate.c @@ -27,7 +27,9 @@ ** This code is in the public domain and has no copyright. */ +#ifndef CM_GET_DATE #include "archive_platform.h" +#endif #ifdef __FreeBSD__ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); diff --git a/Utilities/cmlibarchive/libarchive/archive_read_support_format_rar5.c b/Utilities/cmlibarchive/libarchive/archive_read_support_format_rar5.c index 82729bd..ec40cce 100644 --- a/Utilities/cmlibarchive/libarchive/archive_read_support_format_rar5.c +++ b/Utilities/cmlibarchive/libarchive/archive_read_support_format_rar5.c @@ -31,7 +31,7 @@ #endif #include <time.h> #ifdef HAVE_ZLIB_H -#include <zlib.h> /* crc32 */ +#include <cm_zlib.h> /* crc32 */ #endif #ifdef HAVE_LIMITS_H #include <limits.h> |