aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Turney <jon.turney@dronecode.org.uk>2018-05-17 20:44:39 +0100
committerJussi Pakkanen <jpakkane@gmail.com>2018-05-18 16:22:35 +0300
commitcb34589ede6d223907ae939e4dcd374a8b58bbc0 (patch)
tree29aa1709fc58a68ca86bdbbabdb93de33663b7f8
parent13e92223bec7853ccdd17922625c06d4699e1454 (diff)
downloadmeson-cb34589ede6d223907ae939e4dcd374a8b58bbc0.zip
meson-cb34589ede6d223907ae939e4dcd374a8b58bbc0.tar.gz
meson-cb34589ede6d223907ae939e4dcd374a8b58bbc0.tar.bz2
appveyor: update boost version used with VS 2015
per https://www.appveyor.com/updates/2018/05/16/, boost 1.59 has been removed from the VS 2015 image.
-rw-r--r--.appveyor.yml8
1 files changed, 4 insertions, 4 deletions
diff --git a/.appveyor.yml b/.appveyor.yml
index a1a9c5f..20d365f 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -27,12 +27,12 @@ environment:
- arch: x86
compiler: msvc2015
backend: ninja
- BOOST_ROOT: C:\Libraries\Boost_1_59_0
+ BOOST_ROOT: C:\Libraries\Boost_1_60_0
- arch: x86
compiler: msvc2015
backend: vs2015
- BOOST_ROOT: C:\Libraries\Boost_1_59_0
+ BOOST_ROOT: C:\Libraries\Boost_1_60_0
- arch: x64
compiler: msvc2017
@@ -94,8 +94,8 @@ install:
- cmd: python ./skip_ci.py --base-branch-env=APPVEYOR_REPO_BRANCH --is-pull-env=APPVEYOR_PULL_REQUEST_NUMBER
# Set paths for BOOST dll files
- - cmd: if %compiler%==msvc2015 ( if %arch%==x86 ( set "PATH=%PATH%;C:\Libraries\boost_1_59_0\lib32-msvc-14.0" ) else ( set "PATH=%PATH%;C:\Libraries\boost_1_59_0\lib64-msvc-14.0" ) )
- - cmd: if %compiler%==msvc2017 ( if %arch%==x86 ( set "PATH=%PATH%;C:\Libraries\boost_1_64_0\lib32-msvc-14.1" ) else ( set "PATH=%PATH%;C:\Libraries\boost_1_64_0\lib64-msvc-14.1" ) )
+ - cmd: if %compiler%==msvc2015 ( if %arch%==x86 ( set "PATH=%PATH%;%BOOST_ROOT%\lib32-msvc-14.0" ) else ( set "PATH=%PATH%;%BOOST_ROOT%\lib64-msvc-14.0" ) )
+ - cmd: if %compiler%==msvc2017 ( if %arch%==x86 ( set "PATH=%PATH%;%BOOST_ROOT%\lib32-msvc-14.1" ) else ( set "PATH=%PATH%;%BOOST_ROOT%\lib64-msvc-14.1" ) )
# Set paths and config for each build type.
- cmd: if %compiler%==msvc2010 ( call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" %arch% )