From 4d26b50c367653fe6b4f1cc8ed5394792a2bc9dc Mon Sep 17 00:00:00 2001 From: Marcus Holland-Moritz Date: Sun, 22 Nov 2020 17:48:19 +0100 Subject: [PATCH] Ease requirements on library versions --- CMakeLists.txt | 10 +++++----- src/mkdwarfs.cpp | 13 +++++++++++-- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9ef8b06c..051a27d6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,7 @@ project(dwarfs) -cmake_minimum_required(VERSION 3.18) +cmake_minimum_required(VERSION 3.13.4) option(WITH_TESTS "build with tests" OFF) @@ -43,10 +43,10 @@ find_package(PkgConfig REQUIRED) find_package(Boost 1.67 REQUIRED COMPONENTS date_time filesystem program_options system) -pkg_check_modules(FUSE3 REQUIRED IMPORTED_TARGET fuse3>=3.9.1) -pkg_check_modules(LIBLZ4 IMPORTED_TARGET liblz4>=1.9.2) -pkg_check_modules(LIBLZMA IMPORTED_TARGET liblzma>=5.2.5) -pkg_check_modules(LIBZSTD IMPORTED_TARGET libzstd>=1.4.4) +pkg_check_modules(FUSE3 REQUIRED IMPORTED_TARGET fuse3>=3.4.1) +pkg_check_modules(LIBLZ4 IMPORTED_TARGET liblz4>=1.8.3) +pkg_check_modules(LIBLZMA IMPORTED_TARGET liblzma>=5.2.4) +pkg_check_modules(LIBZSTD IMPORTED_TARGET libzstd>=1.3.8) add_subdirectory(folly EXCLUDE_FROM_ALL) diff --git a/src/mkdwarfs.cpp b/src/mkdwarfs.cpp index ff87ae95..88414e97 100644 --- a/src/mkdwarfs.cpp +++ b/src/mkdwarfs.cpp @@ -38,7 +38,7 @@ #include #include -#if DWARFS_HAVE_LIBZSTD +#ifdef DWARFS_HAVE_LIBZSTD #include #endif @@ -63,6 +63,15 @@ using namespace dwarfs; namespace { +#ifdef DWARFS_HAVE_LIBZSTD +#if ZSTD_VERSION_MAJOR > 1 || \ + (ZSTD_VERSION_MAJOR == 1 && ZSTD_VERSION_MINOR >= 4) +#define ZSTD_MIN_LEVEL ZSTD_minCLevel() +#else +#define ZSTD_MIN_LEVEL 1 +#endif +#endif + #ifdef DWARFS_HAVE_LUA constexpr const char* script_name = "dwarfs.lua"; #endif @@ -322,7 +331,7 @@ int mkdwarfs(int argc, char** argv) { #ifdef DWARFS_HAVE_LIBZSTD " zstd ZSTD compression\n" " level=[" - << ZSTD_minCLevel() << ".." << ZSTD_maxCLevel() + << ZSTD_MIN_LEVEL << ".." << ZSTD_maxCLevel() << "]\n" #endif #ifdef DWARFS_HAVE_LIBLZMA