diff options
| author | Kirk Shoop <kirk.shoop@microsoft.com> | 2014-06-13 14:54:57 -0700 |
|---|---|---|
| committer | Kirk Shoop <kirk.shoop@microsoft.com> | 2014-06-13 14:54:57 -0700 |
| commit | ee21e59cd2edadaf3510212d0219f571f49853e1 (patch) | |
| tree | 41619a42773741e8d2c8470eeb3f021a60718ae2 | |
| parent | c5205c6931527ed105ce9b7679c05de0816afd4c (diff) | |
| download | RxCpp-ee21e59cd2edadaf3510212d0219f571f49853e1.tar.gz | |
ask travis to build and install libc++
| -rw-r--r-- | .travis.yml | 7 | ||||
| -rw-r--r-- | projects/CMake/CMakeLists.txt | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 8e04084..cf189e8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,13 @@ env: - BUILD_TYPE=Release install: + - if [ "$CXX" == "clang++" ]; then svn co --quiet http://llvm.org/svn/llvm-project/libcxx/trunk libcxx; fi + - if [ "$CXX" == "clang++" ]; then cd libcxx/lib && bash buildit; fi + - if [ "$CXX" == "clang++" ]; then sudo cp ./libc++.so.1.0 /usr/lib/; fi + - if [ "$CXX" == "clang++" ]; then sudo mkdir /usr/include/c++/v1; fi + - if [ "$CXX" == "clang++" ]; then cd .. && sudo cp -r include/* /usr/include/c++/v1/; fi + - if [ "$CXX" == "clang++" ]; then cd /usr/lib && sudo ln -sf libc++.so.1.0 libc++.so; fi + - if [ "$CXX" == "clang++" ]; then sudo ln -sf libc++.so.1.0 libc++.so.1 && cd $cwd; fi - cmake -Hprojects/CMake -BBuild -DCMAKE_BUILD_TYPE=$BUILD_TYPE - cd Build - make diff --git a/projects/CMake/CMakeLists.txt b/projects/CMake/CMakeLists.txt index 304c901..61e9514 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} ) if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") list( APPEND CMAKE_CXX_FLAGS " -std=c++11 -stdlib=libc++ ${CMAKE_CXX_FLAGS}") elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") - list( APPEND CMAKE_CXX_FLAGS " -std=c++0x ${CMAKE_CXX_FLAGS}") + list( APPEND CMAKE_CXX_FLAGS " -std=c++11 ${CMAKE_CXX_FLAGS}") elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") list( APPEND CMAKE_CXX_FLAGS " /DUNICODE /D_UNICODE /bigobj ${CMAKE_CXX_FLAGS}") endif() |