loot/libloot
0
0
Fork 0
mirror of https://github.com/loot/libloot.git synced 2026-07-27 14:16:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update CI builds to Boost 1.65.1

Browse Source
This commit is contained in:
Oliver Hamlet
2017-11-02 19:04:11 +00:00
parent 82b2a8b619
commit 3bcb437ea7
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+4 -4
View File
@@ -13,15 +13,15 @@ addons:
cache:
directories:
- $HOME/boost_1_64_0/boost
- $HOME/boost_1_64_0/stage/64/lib
- $HOME/boost_1_65_1/boost
- $HOME/boost_1_65_1/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.64.0 -a 64 -t gcc-6 filesystem locale system
- python install_boost.py --directory ~ --boost-version 1.65.1 -a 64 -t gcc-6 filesystem locale system
# Install packages for generating documentation
- pip install --user -r docs/requirements.txt
# Add sphinx-build to PATH
@@ -37,7 +37,7 @@ before_script:
- mkdir build
- cd build
# Link dynamically to the C++ standard library runtime.
- cmake .. -DBOOST_ROOT=~/boost_1_64_0 -DBOOST_LIBRARYDIR=~/boost_1_64_0/stage/64/lib
- cmake .. -DBOOST_ROOT=~/boost_1_65_1 -DBOOST_LIBRARYDIR=~/boost_1_65_1/stage/64/lib
script:
- make all
appveyor.yml
+6 -6
View File
@@ -12,9 +12,9 @@ matrix:
fast_finish: true
cache:
- C:\projects\boost_1_61_0\boost
- C:\projects\boost_1_61_0\stage\32\lib
- C:\projects\boost_1_61_0\stage\64\lib
- C:\projects\boost_1_65_1\boost
- C:\projects\boost_1_65_1\stage\32\lib
- C:\projects\boost_1_65_1\stage\64\lib
environment:
github_auth_token:
@@ -32,7 +32,7 @@ install:
- ps: (New-Object Net.WebClient).DownloadFile('https://raw.githubusercontent.com/WrinklyNinja/ci-scripts/1.1.0/install_boost.py', "$env:APPVEYOR_BUILD_FOLDER\install_boost.py")
- ps: (New-Object Net.WebClient).DownloadFile('https://raw.githubusercontent.com/WrinklyNinja/ci-scripts/1.2.0/delete_old_bintray_versions.py', "$env:APPVEYOR_BUILD_FOLDER\delete_old_bintray_versions.py")
- ps: if ($env:PLATFORM -eq "Win32") { $env:ADDRESS_MODEL = '32' } else { $env:ADDRESS_MODEL = '64' }
- ps: python $env:APPVEYOR_BUILD_FOLDER\install_boost.py -d C:\projects -b 1.61.0 -a $env:ADDRESS_MODEL filesystem locale system
- ps: python $env:APPVEYOR_BUILD_FOLDER\install_boost.py -d C:\projects -b 1.65.1 -a $env:ADDRESS_MODEL filesystem locale system
before_build:
- cd %APPVEYOR_BUILD_FOLDER%
@@ -40,9 +40,9 @@ before_build:
- cd build
- ps: |
if ($env:PLATFORM -eq 'Win32') {
cmake .. -G "Visual Studio 14 2015" -DBOOST_ROOT="C:/projects/boost_1_61_0" -DBOOST_LIBRARYDIR="C:/projects/boost_1_61_0/stage/32/lib"
cmake .. -G "Visual Studio 14 2015" -DBOOST_ROOT="C:/projects/boost_1_65_1" -DBOOST_LIBRARYDIR="C:/projects/boost_1_65_1/stage/32/lib"
} else {
cmake .. -G "Visual Studio 14 2015 Win64" -DBOOST_ROOT="C:/projects/boost_1_61_0" -DBOOST_LIBRARYDIR="C:/projects/boost_1_61_0/stage/64/lib"
cmake .. -G "Visual Studio 14 2015 Win64" -DBOOST_ROOT="C:/projects/boost_1_65_1" -DBOOST_LIBRARYDIR="C:/projects/boost_1_65_1/stage/64/lib"
}
build: