diff options
| author | Brad King <brad.king@kitware.com> | 2019-03-12 17:54:44 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-03-13 14:47:21 (GMT) |
| commit | 1761a9a54668da90c61f47afbb4e520a7079a697 (patch) | |
| tree | 8dd0721ed2f025c05c1ab46e0c16d7ffcf23bf37 /Utilities/cmlibarchive/CMakeLists.txt | |
| parent | 2cf29217492a951ee40c17f855faa48aa26098f8 (diff) | |
| download | CMake-1761a9a54668da90c61f47afbb4e520a7079a697.zip CMake-1761a9a54668da90c61f47afbb4e520a7079a697.tar.gz CMake-1761a9a54668da90c61f47afbb4e520a7079a697.tar.bz2 | |
CMake: Enable use of zstd in libarchive
Build zstd as part of CMake or find one on the system. Modify our
port of libarchive to use the zstd configured for use with CMake.
Issue: #18657
Diffstat (limited to 'Utilities/cmlibarchive/CMakeLists.txt')
| -rw-r--r-- | Utilities/cmlibarchive/CMakeLists.txt | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt index 53b3a83..60c8316 100644 --- a/Utilities/cmlibarchive/CMakeLists.txt +++ b/Utilities/cmlibarchive/CMakeLists.txt @@ -376,6 +376,7 @@ IF(LZ4_FOUND) ENDIF(LZ4_FOUND) MARK_AS_ADVANCED(CLEAR LZ4_INCLUDE_DIR) MARK_AS_ADVANCED(CLEAR LZ4_LIBRARY) +ENDIF() # # Find Zstd # @@ -392,16 +393,13 @@ IF(ZSTD_FOUND) SET(HAVE_ZSTD_H 1) INCLUDE_DIRECTORIES(${ZSTD_INCLUDE_DIR}) LIST(APPEND ADDITIONAL_LIBS ${ZSTD_LIBRARY}) - SET(CMAKE_REQUIRED_LIBRARIES ${ZSTD_LIBRARY}) - SET(CMAKE_REQUIRED_INCLUDES ${ZSTD_INCLUDE_DIR}) - CHECK_FUNCTION_EXISTS(ZSTD_compressStream HAVE_LIBZSTD) + SET(HAVE_LIBZSTD 1) # # TODO: test for static library. # ENDIF(ZSTD_FOUND) MARK_AS_ADVANCED(CLEAR ZSTD_INCLUDE_DIR) MARK_AS_ADVANCED(CLEAR ZSTD_LIBRARY) -ENDIF() # # Check headers |