From 3f2152c14df019f441a48e2f9926c24b0aca0fd3 Mon Sep 17 00:00:00 2001
From: Jan Dalheimer <jan@dalheimer.de>
Date: Sat, 12 Apr 2014 18:11:30 +0200
Subject: [PATCH] Let travis build a clang version

---
 .travis.yml          | 3 ++-
 cmake/UseCXX11.cmake | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 842f6b9d7..fdc8215eb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 language: cpp
 compiler:
  - gcc
+ - clang
 cache: apt
 before_install:
  - sudo apt-add-repository -y ppa:beineri/opt-qt521
@@ -9,7 +10,7 @@ before_install:
  - sudo apt-get update -qq
 install:
  - sudo apt-get install -y -qq cmake qt52base qt52svg qt52tools qt52x11extras
- - if [ "$CXX" = "g++" ]; then sudo apt-get install -y -qq g++-4.8; fi
+ - sudo apt-get install -y -qq g++-4.8
  - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
 before_script:
  - mkdir build
diff --git a/cmake/UseCXX11.cmake b/cmake/UseCXX11.cmake
index e94de2bb9..f8afaa6e2 100644
--- a/cmake/UseCXX11.cmake
+++ b/cmake/UseCXX11.cmake
@@ -4,7 +4,7 @@ endif()
 set(__USECXX11_CMAKE__ TRUE)
 
 if(APPLE)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -std=c++11")
 elseif(UNIX)
     # assume GCC, add C++0x/C++11 stuff
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")