From 539d346c69c96188c33be09475b24e611313a9db Mon Sep 17 00:00:00 2001 From: Lars Bilke <lars.bilke@ufz.de> Date: Wed, 10 May 2017 13:55:46 +0200 Subject: [PATCH] [Appveyor] Use ninja generator. --- .appveyor.yml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 6a5bf15fef1..b82cc8fa210 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -20,11 +20,21 @@ cache: - C:\projects\deps\conan install: - - mkdir C:\projects\deps - - mkdir C:\projects\deps\conan + # All external dependencies are installed in C:\projects\deps + - if not exist "C:\projects\deps\" mkdir C:\projects\deps + + # Install conan + - if not exist "C:\projects\deps\conan\" mkdir C:\projects\deps\conan - set PATH=%PATH%;%PYTHON%/Scripts/ - C:\Python27-x64\Scripts\pip.exe install conan + # Install Ninja + - set NINJA_URL="https://github.com/ninja-build/ninja/releases/download/v1.7.2/ninja-win.zip" + - appveyor DownloadFile %NINJA_URL% -FileName ninja.zip + - 7z x ninja.zip -oC:\projects\deps\ninja > nul + - set PATH=C:\projects\deps\ninja;%PATH% + - ninja --version + before_build: - call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64 @@ -34,7 +44,7 @@ before_build: build_script: - mkdir build & cd build - conan install .. - - cmake .. -G "Visual Studio 14 2015 Win64" -DCMAKE_BUILD_TYPE=%configuration% + - cmake .. -G "Ninja" -DCMAKE_BUILD_TYPE=%configuration% - cmake --build . --config %configuration% test_script: -- GitLab