diff --git a/.travis.yml b/.travis.yml index 64731dcfe..2affb3402 100644 --- a/.travis.yml +++ b/.travis.yml @@ -88,20 +88,17 @@ install: - until sudo add-apt-repository --yes ppa:h-rayflood/llvm; do echo retry; done - until sudo add-apt-repository --yes ppa:kalakris/cmake; do echo retry; done - until sudo apt-get -qq update; do echo retry; done - - if [[ $USE_TCMALLOC == TRUE ]]; then until sudo add-apt-repository --yes ppa:agent-8131/ppa && sudo apt-get -qq update && sudo apt-get -qq install libgoogle-perftools-dev; do echo retry; done; fi + - if [[ $USE_TCMALLOC == TRUE ]]; then until sudo add-apt-repository --yes ppa:agent-8131/ppa && sudo apt-get -qq update && sudo apt-get -qq install libgoogle-perftools-dev +; do echo retry; done; fi - until sudo apt-get -qq install libgmp-dev libmpfr-dev; do echo retry; done - - wget http://www.cmake.org/files/v2.8/cmake-2.8.11.2.tar.gz; - tar xvfz cmake-2.8.11.2.tar.gz; - cd cmake-2.8.11.2; - ./configure; - make; - sudo make install; - cd ..; - - until sudo apt-get -qq install python; do echo retry; done + - until sudo apt-get -qq install cmake python; do echo retry; done + - wget https://dl.dropboxusercontent.com/u/203889738/gcc/cmake-bin.tar.gz; + tar xfz cmake-bin.tar.gz; + sudo cp -v cmake-bin/* /usr/bin; - wget http://dl.dropboxusercontent.com/u/203889738/gcc/ninja.tar.gz; tar xfz ninja.tar.gz; cd ninja; - ./bootstrap.py; + ./bootstrap.py > /dev/null 2>&1; sudo cp -v ninja /usr/bin/; cd ..; - until sudo apt-get -qq install libstdc++-4.8-dev; do echo retry; done @@ -147,7 +144,12 @@ before_script: script: - mkdir -p build - cd build - - cmake -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -G Ninja ../src; + - if [[ $CMAKE_BUILD_TYPE == RELEASE && $CMAKE_CXX_COMPILER=clang++-3.3 ]]; + then + cmake -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} ../src; + else + cmake -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -G Ninja ../src; + fi - if [[ $CMAKE_BUILD_TYPE == DEBUG || $CMAKE_BUILD_TYPE == RELEASE || $CMAKE_BUILD_TYPE == TESTCOV ]]; then SITE=Ubuntu12.04@Travis; GIT_COMMIT=`git log --oneline -n 1 | cut -d ' ' -f 1`;