diff options
| author | Stefan Radomski <github@mintwerk.de> | 2016-10-26 13:58:39 (GMT) |
|---|---|---|
| committer | Stefan Radomski <github@mintwerk.de> | 2016-10-26 13:58:39 (GMT) |
| commit | 5573e106735efc23b609e4d0603cc732bfbc3659 (patch) | |
| tree | fd3dc1430dd88f510922531235eca7ccb8fb9a38 | |
| parent | 35f02c12f5e90dc7259787f002fdaeeac646b78d (diff) | |
| download | uscxml-5573e106735efc23b609e4d0603cc732bfbc3659.zip uscxml-5573e106735efc23b609e4d0603cc732bfbc3659.tar.gz uscxml-5573e106735efc23b609e4d0603cc732bfbc3659.tar.bz2 | |
Still trying to fix travis CI
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | CMakeLists.txt | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index e018660..56b0972 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,7 @@ compiler: install: - if [ "$CXX" = "g++" ]; then export CXX="g++-4.9" CC="gcc-4.9"; fi + - if [ "$CXX" = "clang" ]; then export CXX="clang++-3.5" CC="clang-3.5"; fi addons: apt: @@ -19,7 +20,7 @@ addons: packages: - gcc-4.9 - g++-4.9 - - clang + - clang-3.5 before_install: - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update -qq; fi diff --git a/CMakeLists.txt b/CMakeLists.txt index 6bcf0a1..87fc2e5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -122,8 +122,6 @@ endif() if(${CMAKE_CXX_COMPILER_ID} STREQUAL GNU) elseif (${CMAKE_CXX_COMPILER_ID} STREQUAL Clang) - # see http://askubuntu.com/questions/523613/upgrade-to-gcc-4-9-broke-clang - add_definitions("-stdlib=libc++") elseif (${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC) add_definitions("-D_SCL_SECURE_NO_WARNINGS") |