mirror of
https://github.com/loot/libloot.git
synced 2026-07-27 14:16:01 -07:00
Update Boost to 1.67.0
This commit is contained in:
+4
-4
@@ -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
@@ -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:
|
||||
|
||||
Reference in New Issue
Block a user