diff options
| author | Brad King <brad.king@kitware.com> | 2017-02-20 14:10:11 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-02-23 12:15:19 (GMT) |
| commit | fecb70dd34b5ba244263e72c42f90701775e132f (patch) | |
| tree | a1bc5c3d4346b85e1b25d8ef7d826e5365588350 /CMakeLists.txt | |
| parent | a59a7ee95601f3496ec9ba9ae1283a8d980460bf (diff) | |
| download | CMake-fecb70dd34b5ba244263e72c42f90701775e132f.zip CMake-fecb70dd34b5ba244263e72c42f90701775e132f.tar.gz CMake-fecb70dd34b5ba244263e72c42f90701775e132f.tar.bz2 | |
Update CMake pre-cached values for libarchive 3.3.0
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index bec81a3..e613224 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -421,14 +421,15 @@ macro (CMAKE_BUILD_UTILITIES) if(NOT LIBLZMA_FOUND) message(FATAL_ERROR "CMAKE_USE_SYSTEM_LIBLZMA is ON but LibLZMA is not found!") endif() - set(LZMA_INCLUDE_DIR ${LIBLZMA_INCLUDE_DIRS}) - set(LZMA_LIBRARY ${LIBLZMA_LIBRARIES}) else() add_subdirectory(Utilities/cmliblzma) CMAKE_SET_TARGET_FOLDER(cmliblzma "Utilities/3rdParty") - set(LZMA_INCLUDE_DIR + set(LIBLZMA_HAS_AUTO_DECODER 1) + set(LIBLZMA_HAS_EASY_ENCODER 1) + set(LIBLZMA_HAS_LZMA_PRESET 1) + set(LIBLZMA_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Utilities/cmliblzma/liblzma/api") - set(LZMA_LIBRARY cmliblzma) + set(LIBLZMA_LIBRARY cmliblzma) endif() endif() @@ -449,13 +450,14 @@ macro (CMAKE_BUILD_UTILITIES) add_definitions(-DLIBARCHIVE_STATIC) set(ENABLE_NETTLE OFF CACHE INTERNAL "Enable use of Nettle") set(ENABLE_OPENSSL ${CMAKE_USE_OPENSSL} CACHE INTERNAL "Enable use of OpenSSL") - set(ENABLE_LZMA ON CACHE INTERNAL "Enable the use of the system found LZMA library if found") - set(ENABLE_ZLIB ON CACHE INTERNAL "Enable the use of the system found ZLIB library if found") - set(ENABLE_BZip2 ON CACHE INTERNAL "Enable the use of the system found BZip2 library if found") - set(ENABLE_LIBXML2 OFF CACHE INTERNAL "Enable the use of the system found libxml2 library if found") - set(ENABLE_EXPAT ON CACHE INTERNAL "Enable the use of the system found EXPAT library if found") - set(ENABLE_PCREPOSIX OFF CACHE INTERNAL "Enable the use of the system found PCREPOSIX library if found") - set(ENABLE_LibGCC OFF CACHE INTERNAL "Enable the use of the system found LibGCC library if found") + set(ENABLE_LZMA ON CACHE INTERNAL "Enable the use of the system LZMA library if found") + set(ENABLE_LZO OFF CACHE INTERNAL "Enable the use of the system LZO library if found") + set(ENABLE_ZLIB ON CACHE INTERNAL "Enable the use of the system ZLIB library if found") + set(ENABLE_BZip2 ON CACHE INTERNAL "Enable the use of the system BZip2 library if found") + set(ENABLE_LIBXML2 OFF CACHE INTERNAL "Enable the use of the system libxml2 library if found") + set(ENABLE_EXPAT ON CACHE INTERNAL "Enable the use of the system EXPAT library if found") + set(ENABLE_PCREPOSIX OFF CACHE INTERNAL "Enable the use of the system PCREPOSIX library if found") + set(ENABLE_LibGCC OFF CACHE INTERNAL "Enable the use of the system LibGCC library if found") set(ENABLE_XATTR OFF CACHE INTERNAL "Enable extended attribute support") set(ENABLE_ACL OFF CACHE INTERNAL "Enable ACL support") set(ENABLE_ICONV OFF CACHE INTERNAL "Enable iconv support") |