Update Boost to 1.67.0

This commit is contained in:
Oliver Hamlet
2018-06-29 17:36:05 +01:00
parent bfb47a5987
commit 3974227dab
2 changed files with 6 additions and 6 deletions
+4 -4
View File
@@ -15,15 +15,15 @@ addons:
cache:
directories:
- $HOME/boost_1_65_1/boost
- $HOME/boost_1_65_1/stage/64/lib
- $HOME/boost_1_67_0/boost
- $HOME/boost_1_67_0/stage/64/lib
cargo: true
install:
- export CXX="g++-6" CC="gcc-6"
# Build Boost.
- wget https://raw.githubusercontent.com/WrinklyNinja/ci-scripts/1.5.0/install_boost.py
- python install_boost.py --directory ~ --boost-version 1.65.1 -a 64 -t gcc-6 filesystem locale system thread
- python install_boost.py --directory ~ --boost-version 1.67.0 -a 64 -t gcc-6 filesystem locale system thread
# Install packages for generating documentation
- pip install --user -r docs/requirements.txt
# Add sphinx-build to PATH
@@ -39,7 +39,7 @@ before_script:
- mkdir build
- cd build
# Link dynamically to the C++ standard library runtime.
- cmake .. -DBOOST_ROOT=~/boost_1_65_1 -DBOOST_LIBRARYDIR=~/boost_1_65_1/stage/64/lib
- cmake .. -DBOOST_ROOT=~/boost_1_67_0 -DBOOST_LIBRARYDIR=~/boost_1_67_0/stage/64/lib
script:
- make all
+2 -2
View File
@@ -33,9 +33,9 @@ before_build:
- cd build
- ps: |
if ($env:PLATFORM -eq 'Win32') {
cmake .. -G "Visual Studio 14 2015" -DBOOST_ROOT="C:\Libraries\boost_1_63_0" -DBOOST_LIBRARYDIR="C:\Libraries\boost_1_63_0\lib32-msvc-14.0"
cmake .. -G "Visual Studio 14 2015" -DBOOST_ROOT="C:\Libraries\boost_1_67_0" -DBOOST_LIBRARYDIR="C:\Libraries\boost_1_67_0\lib32-msvc-14.0"
} else {
cmake .. -G "Visual Studio 14 2015 Win64" -DBOOST_ROOT="C:\Libraries\boost_1_63_0" -DBOOST_LIBRARYDIR="C:\Libraries\boost_1_63_0\lib64-msvc-14.0"
cmake .. -G "Visual Studio 14 2015 Win64" -DBOOST_ROOT="C:\Libraries\boost_1_67_0" -DBOOST_LIBRARYDIR="C:\Libraries\boost_1_67_0\lib64-msvc-14.0"
}
build: