diff options
| author | Marco Poletti <poletti.marco@gmail.com> | 2017-03-19 10:37:12 +0000 |
|---|---|---|
| committer | Marco Poletti <poletti.marco@gmail.com> | 2017-03-19 10:37:12 +0000 |
| commit | 56e84d4d0fcab9c29f5d1aefaa7c706bff46f983 (patch) | |
| tree | 44b4dc26eb443612409d5db34bd5d584e627ae44 /appveyor.yml | |
| parent | f8d1e29908827f735db0fe6d45488637113ceb46 (diff) | |
| download | google-fruit-56e84d4d0fcab9c29f5d1aefaa7c706bff46f983.tar.gz | |
Introduce a FRUIT_USES_BOOST CMake flag to allow building Fruit without Boost.
This fixes issue #41.
Also re-enable AppVeyor tests with MSVC 2017, we can now run those as long as we disable FRUIT_USES_BOOST.
Diffstat (limited to 'appveyor.yml')
| -rw-r--r-- | appveyor.yml | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/appveyor.yml b/appveyor.yml index e8bef3b..fbdab3e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,7 +4,6 @@ configuration: - Release clone_folder: C:\Fruit environment: - BOOST_DIR: C:\Libraries\boost_1_63_0 PYTHON3_PATH: C:\Python36 matrix: - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 @@ -12,10 +11,17 @@ environment: CMAKE_PATH: 'C:\Program Files (x86)\CMake\bin' CMAKE_GENERATOR: 'MinGW Makefiles' VCVARSALL_DIR: '' - # TODO: Re-enable this once AppVeyor's VS 2017 image has Boost or once Fruit no longer has a hard-dependency on Boost. - #- 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' + ADDITIONAL_CMAKE_ARGS: '-DBOOST_DIR=C:\Libraries\boost_1_63_0' + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + MINGW_PATH: 'C:\MinGW\bin' + CMAKE_PATH: 'C:\Program Files (x86)\CMake\bin' + CMAKE_GENERATOR: 'MinGW Makefiles' + VCVARSALL_DIR: '' + ADDITIONAL_CMAKE_ARGS: '-DFRUIT_USES_BOOST=False' + - 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' + ADDITIONAL_CMAKE_ARGS: '-DFRUIT_USES_BOOST=False' build_script: - cmd: cmd /c C:\Fruit\extras\scripts\postsubmit.bat |