Bump required boost and cmake version to match mtxclient
5 files changed, 12 insertions, 11 deletions
diff --git a/.ci/install.sh b/.ci/install.sh
index 0942af62..2c7c71e3 100755
--- a/.ci/install.sh
+++ b/.ci/install.sh
@@ -31,8 +31,8 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then
QT_PKG="59"
fi
- wget https://cmake.org/files/v3.12/cmake-3.12.2-Linux-x86_64.sh
- sudo sh cmake-3.12.2-Linux-x86_64.sh --skip-license --prefix=/usr/local
+ wget https://cmake.org/files/v3.15/cmake-3.15.5-Linux-x86_64.sh
+ sudo sh cmake-3.15.5-Linux-x86_64.sh --skip-license --prefix=/usr/local
mkdir -p build-libsodium
( cd build-libsodium
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e07df88d..c918d834 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -259,7 +259,7 @@ include(FeatureSummary)
set(Boost_USE_STATIC_LIBS OFF)
set(Boost_USE_STATIC_RUNTIME OFF)
set(Boost_USE_MULTITHREADED ON)
-find_package(Boost 1.66 REQUIRED
+find_package(Boost 1.70 REQUIRED
COMPONENTS atomic
chrono
date_time
diff --git a/README.md b/README.md
index efa37e89..0380a90a 100644
--- a/README.md
+++ b/README.md
@@ -92,11 +92,11 @@ sudo port install nheko
- Qt5 (5.8 or greater). Qt 5.7 adds support for color font rendering with
Freetype, which is essential to properly support emoji, 5.8 adds some features
to make interopability with Qml easier.
-- CMake 3.1 or greater.
+- CMake 3.15 or greater. (Lower version may work, but may break boost linking)
- [mtxclient](https://github.com/Nheko-Reborn/mtxclient)
- [LMDB](https://symas.com/lightning-memory-mapped-database/)
- [cmark](https://github.com/commonmark/cmark)
-- Boost 1.66 or greater.
+- Boost 1.70 or greater.
- [libolm](https://git.matrix.org/git/olm)
- [libsodium](https://github.com/jedisct1/libsodium)
- [spdlog](https://github.com/gabime/spdlog)
diff --git a/appveyor.yml b/appveyor.yml
index 08251174..8572418f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -34,6 +34,7 @@ install:
lmdb:%PLATFORM%-windows
openssl:%PLATFORM%-windows
zlib:%PLATFORM%-windows
+ - vcpkg upgrade --no-dry-run
build_script:
# VERSION format: branch-master/branch-1.2
diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
index c5932ab7..fd33cfe7 100644
--- a/deps/CMakeLists.txt
+++ b/deps/CMakeLists.txt
@@ -33,23 +33,23 @@ option(USE_BUNDLED_JSON "Use the bundled version of nlohmann json." ${USE_BUNDLE
option(MTX_STATIC "Compile / link bundled mtx client statically" OFF)
if(USE_BUNDLED_BOOST)
- # bundled boost is 1.68, which requires CMake 3.12 or greater.
- cmake_minimum_required(VERSION 3.12)
+ # bundled boost is 1.70, which requires CMake 3.15 or greater.
+ cmake_minimum_required(VERSION 3.15)
endif()
include(ExternalProject)
set(BOOST_URL
- https://dl.bintray.com/boostorg/release/1.69.0/source/boost_1_69_0.tar.bz2)
+ https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_70_0.tar.bz2)
set(BOOST_SHA256
- 8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406)
+ 430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778)
set(
MTXCLIENT_URL
- https://github.com/Nheko-Reborn/mtxclient/archive/f719236b08d373d9508f2467bbfc6dfa953b1f8d.zip
+ https://github.com/Nheko-Reborn/mtxclient/archive/e5ece22157d73f516267098dafab2e9e320932a0.zip
)
set(MTXCLIENT_HASH
- 0660756c16cf297e02b0b29c07a59fc851723cc65f305893ae7238e6dd2e41c8)
+ 5cf55ae82e09548d4d097b8b380fa61515e742d65a20c4d124eec55029cdc7ab)
set(
TWEENY_URL
https://github.com/mobius3/tweeny/archive/b94ce07cfb02a0eb8ac8aaf66137dabdaea857cf.tar.gz
|
