From ae6563ff4565ed4771dfc5d96303daa9842b4051 Mon Sep 17 00:00:00 2001 From: Sam Bingner Date: Thu, 26 Dec 2019 14:38:32 -1000 Subject: Revert "Forcibly remove LZ4" This reverts commit 3737e81f34cb6f9c8c265a01976ef37f95dcb4e1. --- CMakeLists.txt | 5 +++++ apt-pkg/CMakeLists.txt | 2 ++ 2 files changed, 7 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index beb259a6b..e55a4a067 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -99,6 +99,11 @@ if (LZMA_FOUND) endif() +find_package(LZ4 REQUIRED) +if (LZ4_FOUND) + set(HAVE_LZ4 1) +endif() + find_package(Zstd) if (ZSTD_FOUND) set(HAVE_ZSTD 1) diff --git a/apt-pkg/CMakeLists.txt b/apt-pkg/CMakeLists.txt index e01261c05..64709ce34 100644 --- a/apt-pkg/CMakeLists.txt +++ b/apt-pkg/CMakeLists.txt @@ -43,6 +43,7 @@ target_include_directories(apt-pkg PRIVATE ${ZLIB_INCLUDE_DIRS} ${BZIP2_INCLUDE_DIR} ${LZMA_INCLUDE_DIRS} + ${LZ4_INCLUDE_DIRS} $<$:${ZSTD_INCLUDE_DIRS}> $<$:${UDEV_INCLUDE_DIRS}> ${ICONV_INCLUDE_DIRS} @@ -54,6 +55,7 @@ target_link_libraries(apt-pkg ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ${LZMA_LIBRARIES} + ${LZ4_LIBRARIES} $<$:${ZSTD_LIBRARIES}> $<$:${UDEV_LIBRARIES}> ${ICONV_LIBRARIES} -- cgit v1.2.3