Skip to content

Commit 15c28cb

Browse files
authored
Merge pull request #3 from saxbophone/josh/new-compilers
Use the newer compilers
2 parents 98a7bf0 + 7b9656a commit 15c28cb

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

.travis.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,17 @@ matrix:
3939
- MATRIX_EVAL="CMAKE_GENERATOR='Unix Makefiles' && CXX=clang++-10"
4040
- name: Clang 10 on macOS
4141
os: osx
42-
osx_image: xcode10.3 # this image has CLang 10.0.1 (same as Linux) and CMake 3.15
42+
osx_image: xcode12.2 # this image has Clang >10.0.1 and CMake >3.15
4343
env:
4444
- MATRIX_EVAL="CMAKE_GENERATOR='Unix Makefiles' && CXX=clang++"
45-
- name: MSVC 2017 on Windows
45+
- name: MSVC 2019 on Windows
4646
os: windows
4747
env:
48-
- MATRIX_EVAL="CMAKE_GENERATOR='Visual Studio 15 2017'"
48+
- MATRIX_EVAL="CMAKE_GENERATOR='Visual Studio 16 2019'"
4949
before_install:
5050
- eval "${MATRIX_EVAL}"
51+
install:
52+
- if [ $TRAVIS_OS_NAME = 'windows' ]; then choco install visualstudio2019buildtools --package-parameters "--add Microsoft.VisualStudio.Component.VC.Tools.x86.x64"; fi
5153
before_script:
5254
- cd build
5355
- cmake -G "$CMAKE_GENERATOR" ..

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ A template for a cross-platform C++20 project including CMake, unit-testing with
77
- Travis-CI config file supporting building and running tests on Linux, macOS and Windows using the following compilers:
88
- Linux: GCC-10, Clang-10
99
- macOS: Clang-10
10-
- Windows: MSVC 2017
10+
- Windows: MSVC 2019
1111
- 1 Additional build on Linux to check Doxygen documentation is well-formed
1212
- Doxygen config file with tweaks from the default config settings to provide a few more graphs (usage, caller/callee relationships) than are enabled by default.
1313

0 commit comments

Comments
 (0)