summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSky <git@bunnies.cc>2014-04-12 17:30:21 +0100
committerSky <git@bunnies.cc>2014-04-12 17:30:21 +0100
commit04b36a3e55f8dedf9f0a4992c4347a21131b4176 (patch)
tree7f124714d8f6e9e84104d0dec9764eae371f383e
parent8a6c64ef6265b1294e3ded64716c3cee5fcfd010 (diff)
parent3f2152c14df019f441a48e2f9926c24b0aca0fd3 (diff)
downloadMultiMC-04b36a3e55f8dedf9f0a4992c4347a21131b4176.tar
MultiMC-04b36a3e55f8dedf9f0a4992c4347a21131b4176.tar.gz
MultiMC-04b36a3e55f8dedf9f0a4992c4347a21131b4176.tar.lz
MultiMC-04b36a3e55f8dedf9f0a4992c4347a21131b4176.tar.xz
MultiMC-04b36a3e55f8dedf9f0a4992c4347a21131b4176.zip
Merge pull request #212 from MultiMC/feature_travis_clang
Get Travis to build GCC and Clang versions on Linux as we consider moving to Clang on Linux in general
-rw-r--r--.travis.yml3
-rw-r--r--cmake/UseCXX11.cmake2
2 files changed, 3 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 842f6b9d..fdc8215e 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 e94de2bb..f8afaa6e 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")