Add msvc2019 to CI

This commit is contained in:
Victor Zverovich 2019-06-01 06:47:48 -07:00
parent c929684e33
commit c56b17029a
2 changed files with 23 additions and 12 deletions

View File

@ -23,14 +23,17 @@ else:
# Add MSBuild 14.0 to PATH as described in # Add MSBuild 14.0 to PATH as described in
# http://help.appveyor.com/discussions/problems/2229-v140-not-found-on-vs2105rc. # http://help.appveyor.com/discussions/problems/2229-v140-not-found-on-vs2105rc.
os.environ['PATH'] = r'C:\Program Files (x86)\MSBuild\15.0\Bin;' + path os.environ['PATH'] = r'C:\Program Files (x86)\MSBuild\15.0\Bin;' + path
if image == 'Visual Studio 2013': if image == 'Visual Studio 2019':
generator = 'Visual Studio 12 2013' generator = 'Visual Studio 16 2019'
elif image == 'Visual Studio 2015': if platform == 'x64':
generator = 'Visual Studio 14 2015' cmake_command.extend(['-A', 'x64'])
elif image == 'Visual Studio 2017': else:
generator = 'Visual Studio 15 2017' if image == 'Visual Studio 2015':
if platform == 'x64': generator = 'Visual Studio 14 2015'
generator += ' Win64' elif image == 'Visual Studio 2017':
generator = 'Visual Studio 15 2017'
if platform == 'x64':
generator += ' Win64'
cmake_command.append('-G' + generator) cmake_command.append('-G' + generator)
build_command = ['cmake', '--build', '.', '--config', config, '--', '/m:4'] build_command = ['cmake', '--build', '.', '--config', config, '--', '/m:4']
test_command = ['ctest', '-C', config] test_command = ['ctest', '-C', config]

View File

@ -4,19 +4,27 @@ configuration:
clone_depth: 1 clone_depth: 1
image:
- Visual Studio 2015
- Visual Studio 2019
- Visual Studio 2017
platform: platform:
- Win32 - Win32
- x64 - x64
image:
- Visual Studio 2015
- Visual Studio 2017
environment: environment:
CTEST_OUTPUT_ON_FAILURE: 1 CTEST_OUTPUT_ON_FAILURE: 1
MSVC_DEFAULT_OPTIONS: ON MSVC_DEFAULT_OPTIONS: ON
BUILD: msvc BUILD: msvc
matrix:
exclude:
- image: Visual Studio 2015
platform: Win32
- image: Visual Studio 2019
platform: Win32
before_build: before_build:
- mkdir build - mkdir build
- cd build - cd build