Skip to content
Snippets Groups Projects
Commit cd49be7d authored by Nicolas Werner's avatar Nicolas Werner
Browse files

Require boost 1.70

The bug fix for the race condition on handler execution used the new
strand interface. While it is possible to use bind_executor on every
call, that is error prone and not the suggested usage anymore.
parent f719236b
No related branches found
No related tags found
No related merge requests found
......@@ -92,7 +92,7 @@ set_package_properties(nlohmann_json PROPERTIES
set(Boost_USE_STATIC_LIBS OFF)
set(Boost_USE_STATIC_RUNTIME OFF)
set(Boost_USE_MULTITHREADED ON)
find_package(Boost 1.66
find_package(Boost 1.70
COMPONENTS atomic
chrono
date_time
......
......@@ -52,8 +52,8 @@ RUN \
cmake --build build --target install && \
# boost
mkdir -p /build/boost && cd /build/boost && \
curl -L https://dl.bintray.com/boostorg/release/1.68.0/source/boost_1_68_0.tar.gz -o boost_1_68_0.tar.gz && \
tar xfz boost_1_68_0.tar.gz && cd /build/boost/boost_1_68_0/ && \
curl -L https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_70_0.tar.gz -o boost_1_70_0.tar.gz && \
tar xfz boost_1_70_0.tar.gz && cd /build/boost/boost_1_70_0/ && \
./bootstrap.sh --with-libraries=random,thread,system,iostreams,atomic,chrono,date_time,regex && \
./b2 -d0 cxxstd=14 variant=release link=static threading=multi --layout=system && \
./b2 -d0 install && \
......
......@@ -11,7 +11,7 @@ Client API library for the Matrix protocol, built on top of Boost.Asio.
### Dependencies
- Boost 1.66 (includes Boost.Beast)
- Boost 1.70 (includes Boost.Beast and makes the strand interface usable)
- OpenSSL
- C++ 14 compiler
- CMake 3.1 or greater
......
---
version: 0.2.0-{build}
version: 0.3.0-{build}
configuration: Release
image: Visual Studio 2017
......@@ -30,6 +30,7 @@ install:
openssl:%PLATFORM%-windows
spdlog:%PLATFORM%-windows
zlib:%PLATFORM%-windows
- vcpkg upgrade --no-dry-run
build_script:
- cmake --version
......
......@@ -40,9 +40,9 @@ if(USE_BUNDLED_BOOST)
endif()
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(GTEST_URL https://github.com/google/googletest/archive/release-1.8.0.tar.gz)
set(GTEST_SHA1 e7e646a6204638fe8e87e165292b8dd9cd4c36ed)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment