diff --git a/.circleci/config.yml b/.circleci/config.yml index 65284526..1c87ef18 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -60,8 +60,8 @@ references: DEBIAN_FRONTEND=noninteractive sudo apt-get install -y git ccache $APT_COMPILER_PACKAGE make libcurl4-openssl-dev libssl-dev libfuse-dev # install cmake - wget -O /tmp/cmake.sh https://github.com/Kitware/CMake/releases/download/v3.9.6/cmake-3.9.6-Linux-x86_64.sh - if [ $(sha256sum /tmp/cmake.sh | awk '{print $1;}') == "57cd1dc4857e4d3689d006faf6ff56d5e3635c64d456e34596476db5e9ba8031" ]; then + wget -O /tmp/cmake.sh https://github.com/Kitware/CMake/releases/download/v3.10.2/cmake-3.10.2-Linux-x86_64.sh + if [ $(sha256sum /tmp/cmake.sh | awk '{print $1;}') == "9348039642fc0213f4dd4235e513adc8ffbe6424ee98f349db17ca2a523a5d1b" ]; then echo Correct sha256sum else echo Wrong sha256sum @@ -153,8 +153,8 @@ references: echo Download spdlog cd ~ - wget https://github.com/gabime/spdlog/archive/v1.4.2.tar.gz -O spdlog.tar.gz - if [ $(sha512sum spdlog.tar.gz | awk '{print $1;}') == "886b489138a1bdf363b5eab65a7d973f570a01c399ff5b910fcfee172ad4ff4d42a45dc2ae24e77b07130df527fb13a86b3e55ac992e72c418aebb232e27eabf" ]; then + wget https://github.com/gabime/spdlog/archive/v1.8.2.tar.gz -O spdlog.tar.gz + if [ $(sha512sum spdlog.tar.gz | awk '{print $1;}') == "7a0a2353a10187cc314253b366fc46be8f9fe2480d2cbac3a96a8e6825ee4b62b0a5ebb3add2b22b5d7ca8fe6dddd963926603e5296e3431c0a4f7ac42beda7f" ]; then echo Correct sha512sum else echo Wrong sha512sum @@ -163,7 +163,7 @@ references: fi tar -xvf spdlog.tar.gz rm spdlog.tar.gz - cd spdlog-1.4.2 + cd spdlog-1.8.2 echo Install spdlog mkdir build diff --git a/CMakeLists.txt b/CMakeLists.txt index 0595159c..9c707563 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.9 FATAL_ERROR) +cmake_minimum_required(VERSION 3.10 FATAL_ERROR) # TODO Remove this deprecated policy switch once we're on cmake 3.4 or later cmake_policy(SET CMP0065 OLD) diff --git a/ChangeLog.txt b/ChangeLog.txt index 7d30daa9..bfa1eb96 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -4,7 +4,7 @@ Build changes: * Switch to Conan package manager * Allow an easy way to modify how the dependencies are found. This is mostly helpful for package maintainers. * Build with LTO if the compiler supports it -* Now requires CMake 3.9 or later +* Now requires CMake 3.10 or later Improvements: * Display the file system configuration when mounting a file system @@ -18,6 +18,8 @@ New features: * Add an --immediate flag to cryfs-unmount that tries to unmount immediately and doesn't wait for processes to release their locks on the file system. * Add a --create-missing-basedir and --create-missing-mountpoint flag to create the base directory and mount directory respectively, if they don't exist, skipping the confirmation prompt. +Other: +* Updated to spdlog 1.8.2 Version 0.10.3 (unreleased) --------------- diff --git a/README.md b/README.md index b1a60872..e2a62c08 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ Requirements ------------ - Git (for getting the source code) - GCC version >= 6.5 or Clang >= 4.0 - - CMake version >= 3.9 + - CMake version >= 3.10 - Conan package manager - libcurl4 (including development headers) - SSL development libraries (including development headers, e.g. libssl-dev) diff --git a/conanfile.py b/conanfile.py index 89135777..f7088b0a 100644 --- a/conanfile.py +++ b/conanfile.py @@ -4,7 +4,7 @@ class CryFSConan(ConanFile): settings = "os", "compiler", "build_type", "arch" requires = [ "range-v3/0.9.1@ericniebler/stable", - "spdlog/1.4.2", + "spdlog/1.8.2", ] generators = "cmake" default_options = {