From d41a61ff0fc70eed22396fa1b302fe091db2df50 Mon Sep 17 00:00:00 2001 From: Daniel Chappuis Date: Thu, 5 Apr 2018 07:40:01 +0200 Subject: [PATCH] Edit CMakeList.txt and travis file --- .travis.yml | 7 ++++--- CMakeLists.txt | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index ece0787a..7b1df03b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/CMakeLists.txt b/CMakeLists.txt index a2edbdf1..dcec9f53 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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()