Edit CMakeList.txt and travis file

This commit is contained in:
Daniel Chappuis 2018-04-05 07:40:01 +02:00
parent b3ebfb7d1e
commit d41a61ff0f
2 changed files with 5 additions and 3 deletions

View File

@ -25,11 +25,12 @@ matrix:
apt:
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.6
- llvm-toolchain-precise-3.8
packages:
- clang-3.6
- clang-3.8
- g++-7
env:
- MATRIX_EVAL="CC=clang-3.6 && CXX=clang++-3.6"
- MATRIX_EVAL="CC=clang-3.8 && CXX=clang++-3.8"
# OS X / Clang
- os: osx

View File

@ -51,6 +51,7 @@ IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
ENDIF()
ENDIF()
# Use libc++ with Clang
#IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
# SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
#ENDIF()