Skip to content

Commit 5ab3c43

Browse files
committed
Fix CI builds
1 parent a8cda74 commit 5ab3c43

File tree

3 files changed

+2
-11
lines changed

3 files changed

+2
-11
lines changed

.travis.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,6 @@ matrix:
4545
sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-6.0']
4646
packages: ['cmake', 'clang-6.0', 'g++-6', 'libboost-dev']
4747

48-
- os: linux
49-
compiler: clang
50-
env: COMPILER=clang++-7.0
51-
addons:
52-
apt:
53-
sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty']
54-
packages: ['cmake', 'clang', 'g++-6', 'libboost-dev']
55-
5648
script:
5749
- if [[ "${COMPILER}" != "" ]]; then export CXX=${COMPILER}; fi
5850
- uname -a

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ 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")
32+
# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++14")
3333

3434
if (NOT DEFINED MSVC_RUNTIME_TYPE)
3535
if (NOT WITH_TESTS)

appveyor.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ matrix:
1515
init:
1616
- if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" if "%PLATFORM%"=="x86" call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat"
1717
- if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" if "%PLATFORM%"=="x64" call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
18-
- if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" if "%PLATFORM%"=="x86" call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
19-
- if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" if "%PLATFORM%"=="x64" call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64
18+
- if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
2019

2120
install:
2221
- git submodule -q update --init

0 commit comments

Comments
 (0)