diff options
| author | jackpoz <giacomopoz@gmail.com> | 2018-03-07 20:13:19 +0100 |
|---|---|---|
| committer | jackpoz <giacomopoz@gmail.com> | 2018-03-07 20:13:19 +0100 |
| commit | 171583b9844f86301afbf5fba9c3778ce6252b38 (patch) | |
| tree | 8aecce642c5491cc09345c6da6d7d22ccade9931 | |
| parent | 0c1e485e13d065b26e24b4226044246ae8ca0e4d (diff) | |
Dep/Boost: Set boost version to 1.58 on *nix
| -rw-r--r-- | .travis.yml | 15 | ||||
| -rw-r--r-- | dep/boost/CMakeLists.txt | 2 |
2 files changed, 9 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index c0d4525e0a4..3deb3f6eff1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,15 +12,16 @@ addons: apt: sources: - ubuntu-toolchain-r-test + - sourceline: 'ppa:kzemek/boost' packages: - g++-6 - - 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 84093a73efb..58fc5596523 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.58) endif() find_package(Boost ${BOOST_REQUIRED_VERSION} REQUIRED system filesystem thread program_options iostreams regex) |