diff options
| author | Marco Poletti <poletti.marco@gmail.com> | 2017-03-18 21:16:28 +0000 |
|---|---|---|
| committer | Marco Poletti <poletti.marco@gmail.com> | 2017-03-18 21:16:28 +0000 |
| commit | 4b0c452ca98c9b22f15683e721394155d37ee70f (patch) | |
| tree | 71ee971f8f5221bd4e76a743057aac817f049ce3 /appveyor.yml | |
| parent | d56b6e683903f53b61c0bd59cd5ee1d2aa360e3c (diff) | |
| download | google-fruit-4b0c452ca98c9b22f15683e721394155d37ee70f.tar.gz | |
More changes to the AppVeyor config/script:
* Use the MSVC 2015 image when testing with MinGW (the MSVC 2017 image doesn't have boost ATM)
* Set the reduced path using setx too
* Specify the C/CXX compilers explicitly in the CMake invocation when testing with MinGW
Diffstat (limited to 'appveyor.yml')
| -rw-r--r-- | appveyor.yml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/appveyor.yml b/appveyor.yml index cade269..5f94b49 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,4 @@ version: 1.0.{build} -image: Visual Studio 2017 configuration: - Debug - Release @@ -8,11 +7,13 @@ environment: BOOST_DIR: C:\Libraries\boost_1_63_0 PYTHON3_PATH: C:\Python36 matrix: - - MINGW_PATH: 'C:\MinGW\bin' + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + MINGW_PATH: 'C:\MinGW\bin' CMAKE_PATH: 'C:\Program Files (x86)\CMake\bin' CMAKE_GENERATOR: 'MinGW Makefiles' VCVARSALL_DIR: '' - - CMAKE_PATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin' + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + CMAKE_PATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin' CMAKE_GENERATOR: 'Visual Studio 15 2017 Win64' VCVARSALL_DIR: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build' build_script: |