diff options
author | Niklas Claesson <nicke.claesson@gmail.com> | 2017-09-06 23:55:08 +0200 |
---|---|---|
committer | Niklas Claesson <nicke.claesson@gmail.com> | 2017-10-01 18:49:32 +0200 |
commit | 4df86505608d768344078916d7d6f241de0e5f5a (patch) | |
tree | 15f3410cfd57fa204f1420b5cd1e5d4a8e96317d | |
parent | bbdba876afa8adfaf3e1d1985908326443875860 (diff) | |
download | meson-4df86505608d768344078916d7d6f241de0e5f5a.zip meson-4df86505608d768344078916d7d6f241de0e5f5a.tar.gz meson-4df86505608d768344078916d7d6f241de0e5f5a.tar.bz2 |
Appveyor: Enable Boost tests where possible
-rw-r--r-- | .appveyor.yml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 4dc3f50..d150c42 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -19,10 +19,12 @@ environment: - arch: x86 compiler: msvc2015 backend: ninja + BOOST_ROOT: C:\Libraries\Boost_1_59_0 - arch: x86 compiler: msvc2015 backend: vs2015 + BOOST_ROOT: C:\Libraries\Boost_1_59_0 - arch: x64 compiler: cygwin @@ -36,11 +38,13 @@ environment: compiler: msvc2017 backend: ninja APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + BOOST_ROOT: C:\Libraries\Boost_1_64_0 - arch: x64 compiler: msvc2017 backend: vs2017 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + BOOST_ROOT: C:\Libraries\Boost_1_64_0 platform: - x64 @@ -66,6 +70,10 @@ install: # For all other archs (including, say, arm), use the x64 python. - cmd: if %arch%==x86 (set MESON_PYTHON_PATH=C:\python34) else (set MESON_PYTHON_PATH=C:\python34-x64) + # 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" ) ) + # 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% ) - cmd: if %compiler%==msvc2015 ( call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %arch% ) |