From f65f75f3e2c1897e6716afb8855e9b79a42e214b Mon Sep 17 00:00:00 2001
From: adrien-matta <a.matta@surrey.ac.uk>
Date: Wed, 29 Jul 2015 10:08:50 +0100
Subject: [PATCH] * Adding clang to travis
---
.travis.yml | 1 +
NPLib/CMakeLists.txt | 3 +++
2 files changed, 4 insertions(+)
diff --git a/.travis.yml b/.travis.yml
index 880374c5f..7f50879b9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,7 @@ language: cpp
compiler:
- gcc
+ - clang
before_install:
- sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu/ trusty main universe"
diff --git a/NPLib/CMakeLists.txt b/NPLib/CMakeLists.txt
index 0e84a98c6..b64914020 100644
--- a/NPLib/CMakeLists.txt
+++ b/NPLib/CMakeLists.txt
@@ -39,6 +39,9 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${root_cflags}")
# If the compiler is Clang, silence the unrecognised flags
if(${CMAKE_CXX_COMPILER_ID} MATCHES ".*Clang.*")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Qunused-arguments -fcolor-diagnostics")
+ if( UNIX AND NOT APPLE )
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
+ endif()
endif()
set(CMAKE_BINARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )
--
GitLab