diff options
| author | Jan Dalheimer <jan@dalheimer.de> | 2014-04-12 18:11:30 +0200 |
|---|---|---|
| committer | Jan Dalheimer <jan@dalheimer.de> | 2014-04-12 18:11:30 +0200 |
| commit | 3f2152c14df019f441a48e2f9926c24b0aca0fd3 (patch) | |
| tree | 7f124714d8f6e9e84104d0dec9764eae371f383e | |
| parent | 8a6c64ef6265b1294e3ded64716c3cee5fcfd010 (diff) | |
| download | MultiMC-3f2152c14df019f441a48e2f9926c24b0aca0fd3.tar MultiMC-3f2152c14df019f441a48e2f9926c24b0aca0fd3.tar.gz MultiMC-3f2152c14df019f441a48e2f9926c24b0aca0fd3.tar.lz MultiMC-3f2152c14df019f441a48e2f9926c24b0aca0fd3.tar.xz MultiMC-3f2152c14df019f441a48e2f9926c24b0aca0fd3.zip | |
Let travis build a clang version
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | cmake/UseCXX11.cmake | 2 |
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") |