From 4a268b3fd31b538c3ff28b52ee9698cd6553eef8 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Wed, 7 Mar 2018 16:45:39 +0100 Subject: [PATCH] make travis happy --- .travis.yml | 17 ++++++++++------- dep/boost/CMakeLists.txt | 2 +- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6e473dabf8f..77d77e7784f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,14 +10,17 @@ git: addons: apt: + sources: + - ubuntu-toolchain-r-test + - sourceline: 'ppa:kzemek/boost' packages: - - libboost1.55-dev - - libboost-filesystem1.55-dev - - libboost-iostreams1.55-dev - - libboost-program-options1.55-dev - - libboost-regex1.55-dev - - libboost-system1.55-dev - - libboost-thread1.55-dev + - libboost1.58-dev + - libboost-filesystem1.58-dev + - libboost-iostreams1.58-dev + - libboost-program-options1.58-dev + - libboost-regex1.58-dev + - libboost-system1.58-dev + - libboost-thread1.58-dev - libssl-dev - libmysqlclient-dev - libreadline6-dev diff --git a/dep/boost/CMakeLists.txt b/dep/boost/CMakeLists.txt index c5e5ab17117..b556caaaf8b 100644 --- a/dep/boost/CMakeLists.txt +++ b/dep/boost/CMakeLists.txt @@ -38,7 +38,7 @@ if (WIN32) # On windows the requirements are higher according to the wiki. set(BOOST_REQUIRED_VERSION 1.59) else() - set(BOOST_REQUIRED_VERSION 1.55) + set(BOOST_REQUIRED_VERSION 1.56) endif() find_package(Boost ${BOOST_REQUIRED_VERSION} REQUIRED system filesystem thread program_options iostreams regex)