diff --git a/.travis.yml b/.travis.yml index fb367ecb5..5b205e39e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -91,6 +91,7 @@ install: - 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 - until sudo apt-get -qq install cmake; do echo retry; done + - sudo wget http://dl.dropboxusercontent.com/u/203889738/bin/ninja -O /usr/bin/ninja; - until sudo apt-get -qq install libstdc++-4.8-dev; do echo retry; done - if [[ $CMAKE_CXX_COMPILER == g++-4.8 ]]; then until sudo apt-get -qq install g++-4.8; do echo retry; done fi - if [[ $CMAKE_CXX_COMPILER == clang++-3.3 ]]; then until sudo apt-get -qq install clang-3.3; do echo retry; done fi @@ -134,7 +135,7 @@ before_script: script: - mkdir -p build - cd build - - cmake -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} ../src + - cmake -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -G Ninja ../src - 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`; @@ -148,7 +149,7 @@ script: sed -i "s/^Site:.*/Site:$SITE/" $CONFIG_FILE; sed -i "s/BuildName:.*/BuildName:$BUILD_NAME/" $CONFIG_FILE; if [[ $MEMCHECK == TRUE ]]; then - make; + ninja; else ctest -D ExperimentalConfigure; sed -i "s/^Site:.*/Site:$SITE/" $CONFIG_FILE;