From a1fa10ac70446ff5f4e0ba77068752bdbd0549f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Wed, 6 Dec 2017 00:10:35 +0100 Subject: [PATCH] Ninja --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3125906214..123a07d0a6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -64,12 +64,12 @@ before_script: else export CXXFLAGS="$CXXFLAGS -DBRANCH=$TRAVIS_REPO_SLUG/$TRAVIS_BRANCH/#$TRAVIS_PULL_REQUEST"; fi; - - cmake .. -DCMAKE_INSTALL_PREFIX=/usr; - - make -j 3 + - cmake .. -DCMAKE_INSTALL_PREFIX=/usr -G Ninja; + - ninja - # AppImage generation - if [ -n "$UPLOAD_URL" ] && [ "$TRAVIS_BRANCH" = "master" ] && [ "$CC" = "clang-4.0" ] && [ "$TRAVIS_PULL_REQUEST" = false ]; then export LD_LIBRARY_PATH=~/Qt/5.9.3/gcc_64/lib; - make DESTDIR=appdir install ; find appdir/ ; + DESTDIR=appdir ninja install ; find appdir/ ; find ../bin ; wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" ; chmod a+x linuxdeployqt*.AppImage ; @@ -103,6 +103,7 @@ addons: packages: - binutils - cmake + - ninja-build - libasound2-dev - libopenal-dev - freeglut3-dev