appveyor: Actually update the scripts to use MSVC 2015, not just the image.

This commit is contained in:
David Korth 2020-08-12 21:30:33 -04:00
parent e2d592de91
commit 9399248f81
3 changed files with 9 additions and 9 deletions

View File

@ -1,5 +1,5 @@
@ECHO OFF
if not "%compiler%" == "msvc2013" exit /b 0
if not "%compiler%" == "msvc2015" exit /b 0
if not "%configuration%" == "Release" exit /b 0
cpack --version

View File

@ -1,15 +1,15 @@
@ECHO OFF
cmake --version
if "%compiler%" == "msvc2013" goto :msvc2013
if "%compiler%" == "msvc2015" goto :msvc2015
if "%compiler%" == "mingw-w64" goto :mingw-w64
echo *** ERROR: Unsupported compiler '%compiler%'.
exit /b 1
:msvc2013
:msvc2015
set PreferredToolArchitecture=x64
set "CMAKE_GENERATOR=Visual Studio 12 2013"
set CMAKE_GENERATOR_TOOLSET=v120_xp
set "CMAKE_GENERATOR=Visual Studio 14 2015"
set CMAKE_GENERATOR_TOOLSET=v140_xp
if "%platform%" == "x64" set "CMAKE_GENERATOR=%CMAKE_GENERATOR% Win64"
mkdir build
cd build

View File

@ -26,19 +26,19 @@ environment:
matrix:
- platform: x86
configuration: Debug
compiler: msvc2013
compiler: msvc2015
- platform: x86
configuration: Release
compiler: msvc2013
compiler: msvc2015
- platform: x64
configuration: Debug
compiler: msvc2013
compiler: msvc2015
- platform: x64
configuration: Release
compiler: msvc2013
compiler: msvc2015
- platform: x86
configuration: Debug