diff options
| -rw-r--r-- | .travis.yml | 14 | ||||
| -rw-r--r-- | projects/CMake/CMakeLists.txt | 2 |
2 files changed, 6 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index cf189e8..7af6eb0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,21 +8,17 @@ 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 + - brew update + - brew install cmake + - cmake -GXcode -Hprojects/CMake -BBuild -DCMAKE_BUILD_TYPE=$BUILD_TYPE - cd Build - - make + - xcodebuild - cd .. script: - cd Build - ctest -V + - cd .. branches: only: diff --git a/projects/CMake/CMakeLists.txt b/projects/CMake/CMakeLists.txt index 61e9514..7135acc 100644 --- a/projects/CMake/CMakeLists.txt +++ b/projects/CMake/CMakeLists.txt @@ -5,7 +5,7 @@ project(rxcpp) 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}") + list( APPEND CMAKE_CXX_FLAGS " -std=c++11 ${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") |