Work on CI support for MingW

This commit is contained in:
Steffen Schuemann 2019-05-14 06:58:04 +02:00
parent 8926ecc88a
commit 63970fcbb2

View File

@ -1,11 +1,5 @@
environment:
matrix:
- platform: x86
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
generator: "Visual Studio 14 2015"
compiler: msvc
configuration: Release
- platform: x86
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
generator: "MinGW Makefiles"
@ -13,12 +7,6 @@ environment:
toolchain: C:/mingw-w64/i686-6.3.0-posix-dwarf-rt_v5-rev1
configuration: Release
- platform: x64
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
generator: "Visual Studio 14 2015 Win64"
compiler: msvc
configuration: Release
- platform: x64
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
generator: "MinGW Makefiles"
@ -26,18 +14,6 @@ environment:
toolchain: C:/mingw-w64/x86_64-7.2.0-posix-seh-rt_v5-rev1
configuration: Release
- platform: x86
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
generator: "Visual Studio 15 2017"
compiler: msvc
configuration: Release
- platform: x64
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
generator: "Visual Studio 15 2017 Win64"
compiler: msvc
configuration: Release
matrix:
fast_finish: false
@ -54,7 +30,7 @@ build_script:
- cd build
- if [%compiler%]==[msvc] cmake -G"%generator%" ..
- if [%compiler%]==[mingw] set PATH=%toolchain%/bin;%PATH%
- if [%compiler%]==[mingw] cmake -G"%generator%" -DCMAKE_SH=CMAKE_SH-NOTFOUND -DCMAKE_CXX_COMPILER=%toolchain%/bin/g++ -DCMAKE_C_COMPILER=%toolchain%/bin/gcc -DCMAKE_PREFIX_PATH=%toolchain% -DCMAKE_BUILD_TYPE=%configuration% ..
- if [%compiler%]==[mingw] cmake -G"%generator%" -DCMAKE_SH=CMAKE_SH-NOTFOUND -DCMAKE_CXX_COMPILER=%toolchain%/bin/g++.exe -DCMAKE_C_COMPILER=%toolchain%/bin/gcc.exe -DCMAKE_PREFIX_PATH=%toolchain% -DCMAKE_BUILD_TYPE=%configuration% ..
- cmake --build . --config %configuration%
test_script: