Skip to content

Commit f445ac7

Browse files
committed
Fix CI build settings
1 parent d3a45b2 commit f445ac7

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,15 @@ matrix:
4242
env: COMPILER=clang++-6.0
4343
addons:
4444
apt:
45-
sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-5.0']
45+
sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-6.0']
4646
packages: ['cmake', 'clang-6.0', 'g++-6', 'libboost-dev']
4747

4848
- os: linux
4949
compiler: clang
5050
env: COMPILER=clang++-7.0
5151
addons:
5252
apt:
53-
sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-5.0']
53+
sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty']
5454
packages: ['cmake', 'clang-7.0', 'g++-6', 'libboost-dev']
5555

5656
script:

CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ if (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang" OR ${CMAKE_CXX_COMPILER_ID} MATCHES
2929
endif ()
3030
else ()
3131
# MSVC
32+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++latest")
33+
3234
if (NOT DEFINED MSVC_RUNTIME_TYPE)
3335
if (NOT WITH_TESTS)
3436
set (MSVC_RUNTIME_TYPE "/MD")

0 commit comments

Comments
 (0)