diff options
| author | Kirk Shoop <kirk.shoop@microsoft.com> | 2014-08-09 20:32:39 -0700 |
|---|---|---|
| committer | Kirk Shoop <kirk.shoop@microsoft.com> | 2014-08-09 20:32:39 -0700 |
| commit | 1e80c4b244fb764d6d4a1da5a6d40bc1e27645ca (patch) | |
| tree | 3632fb61ae7a199f35fd4443ada9fa225ffe72f9 /projects | |
| parent | 80f3ca2178549b3c37bd566f6cce9ea8340c6db2 (diff) | |
| download | RxCpp-1e80c4b244fb764d6d4a1da5a6d40bc1e27645ca.tar.gz | |
linux fixes
Diffstat (limited to 'projects')
| -rw-r--r-- | projects/CMake/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | projects/scripts/travis-install.sh | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/projects/CMake/CMakeLists.txt b/projects/CMake/CMakeLists.txt index b71b95e..d5e260f 100644 --- a/projects/CMake/CMakeLists.txt +++ b/projects/CMake/CMakeLists.txt @@ -7,7 +7,7 @@ MESSAGE( STATUS "CMAKE_CXX_COMPILER_ID: " ${CMAKE_CXX_COMPILER_ID} ) FIND_PACKAGE(Threads) if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - list( APPEND CMAKE_CXX_FLAGS " -std=c++11 ${CMAKE_CXX_FLAGS}") + list( APPEND CMAKE_CXX_FLAGS " -std=c++11 -ftemplate-depth=1024 ${CMAKE_CXX_FLAGS}") elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") list( APPEND CMAKE_CXX_FLAGS " -std=c++11 ${CMAKE_CXX_FLAGS}") elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") diff --git a/projects/scripts/travis-install.sh b/projects/scripts/travis-install.sh index 8f9f5fe..466c1fa 100755 --- a/projects/scripts/travis-install.sh +++ b/projects/scripts/travis-install.sh @@ -15,6 +15,8 @@ if [ "$TRAVIS_OS_NAME" = linux -o -z "$TRAVIS_OS_NAME" ]; then if [ "$CC" = clang ]; then sudo apt-get install -q --fix-missing clang-3.6 + sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-3.6 20 + sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-3.6 20 fi if [ "$CC" = gcc ]; then |