j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

👷 choosing correct image

Browse source
This commit is contained in:
Niels Lohmann 2018-06-24 17:40:16 +02:00
parent 1bbc4a0859
commit 09c0df4a21
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
2 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
appveyor.yml
View file

@ -2,55 +2,52 @@ version: '{build}'
environment: environment:
matrix: matrix:
- os: Visual Studio 2015 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
COMPILER: mingw COMPILER: mingw
platform: x86 platform: x86
FLAGS: "" FLAGS: ""
GENERATOR: Ninja GENERATOR: Ninja
- os: Visual Studio 2015 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
platform: x86 platform: x86
FLAGS: "" FLAGS: ""
GENERATOR: Visual Studio 14 2015 GENERATOR: Visual Studio 14 2015
- os: Visual Studio 2017 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
platform: x86 platform: x86
FLAGS: "" FLAGS: ""
GENERATOR: Visual Studio 15 2017 GENERATOR: Visual Studio 15 2017
- os: Visual Studio 2017 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
platform: x86 platform: x86
FLAGS: "/permissive- /std:c++latest /utf-8" FLAGS: "/permissive- /std:c++latest /utf-8"
GENERATOR: Visual Studio 15 2017 GENERATOR: Visual Studio 15 2017
- os: Visual Studio 2015 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
platform: x64 platform: x64
FLAGS: "" FLAGS: ""
GENERATOR: Visual Studio 14 2015 GENERATOR: Visual Studio 14 2015
- os: Visual Studio 2017 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
platform: x64 platform: x64
FLAGS: "" FLAGS: ""
GENERATOR: Visual Studio 15 2017 GENERATOR: Visual Studio 15 2017
- os: Visual Studio 2017 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
platform: x64 platform: x64
FLAGS: "/permissive- /std:c++latest /utf-8" FLAGS: "/permissive- /std:c++latest /utf-8"
GENERATOR: Visual Studio 15 2017 GENERATOR: Visual Studio 15 2017
matrix:
fast_finish: true
init: init:
- cmake --version - cmake --version
- msbuild /version - msbuild /version
install: install:
- set NINJA_URL="https://github.com/ninja-build/ninja/releases/download/v1.6.0/ninja-win.zip" - if "%COMPILER%"=="mingw" appveyor DownloadFile https://github.com/ninja-build/ninja/releases/download/v1.6.0/ninja-win.zip -FileName ninja.zip
- appveyor DownloadFile %NINJA_URL% -FileName ninja.zip - if "%COMPILER%"=="mingw" 7z x ninja.zip -oC:\projects\deps\ninja > nul
- 7z x ninja.zip -oC:\projects\deps\ninja > nul - if "%COMPILER%"=="mingw" set PATH=C:\projects\deps\ninja;%PATH%
- set PATH=C:\projects\deps\ninja;%PATH%
- if "%COMPILER%"=="mingw" set PATH=C:\mingw-w64\x86_64-7.3.0-posix-seh-rt_v5-rev0\mingw64\bin;%PATH% - if "%COMPILER%"=="mingw" set PATH=C:\mingw-w64\x86_64-7.3.0-posix-seh-rt_v5-rev0\mingw64\bin;%PATH%
- if "%COMPILER%"=="mingw" g++ --version
before_build: before_build:
- cmake . -G "%GENERATOR%" -DCMAKE_CXX_FLAGS="%FLAGS%" -DCMAKE_IGNORE_PATH="C:/Program Files/Git/usr/bin" - cmake . -G "%GENERATOR%" -DCMAKE_CXX_FLAGS="%FLAGS%" -DCMAKE_IGNORE_PATH="C:/Program Files/Git/usr/bin"

2
test/CMakeLists.txt
View file

@ -116,7 +116,7 @@ foreach(file ${files})
set_tests_properties("${testcase}_default" PROPERTIES LABELS "default") set_tests_properties("${testcase}_default" PROPERTIES LABELS "default")
add_test(NAME "${testcase}_all" add_test(NAME "${testcase}_all"
COMMAND ${testcase} ${CATCH_TEST_FILTER} "\\*" COMMAND ${testcase} ${CATCH_TEST_FILTER} "*"
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
) )
set_tests_properties("${testcase}_all" PROPERTIES LABELS "all") set_tests_properties("${testcase}_all" PROPERTIES LABELS "all")