Edit CMakeList.txt and travis file
This commit is contained in:
parent
b3ebfb7d1e
commit
d41a61ff0f
|
@ -25,11 +25,12 @@ matrix:
|
||||||
apt:
|
apt:
|
||||||
sources:
|
sources:
|
||||||
- ubuntu-toolchain-r-test
|
- ubuntu-toolchain-r-test
|
||||||
- llvm-toolchain-precise-3.6
|
- llvm-toolchain-precise-3.8
|
||||||
packages:
|
packages:
|
||||||
- clang-3.6
|
- clang-3.8
|
||||||
|
- g++-7
|
||||||
env:
|
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 X / Clang
|
||||||
- os: osx
|
- os: osx
|
||||||
|
|
|
@ -51,6 +51,7 @@ IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
|
||||||
ENDIF()
|
ENDIF()
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
||||||
|
# Use libc++ with Clang
|
||||||
#IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
#IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
||||||
# SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
|
# SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
|
||||||
#ENDIF()
|
#ENDIF()
|
||||||
|
|
Loading…
Reference in New Issue
Block a user