summaryrefslogtreecommitdiff
path: root/.travis
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-06-07 11:45:50 -0400
committerGitHub <noreply@github.com>2018-06-07 11:45:50 -0400
commit5aff2d38a940892ce93a813e8de5100f919956d2 (patch)
treed205646d54565a7659e1f2586bce677fbe0ee0d4 /.travis
parentee318d4015f1d19fc80d0bfc3d3aba29c3df342e (diff)
parent2abf39ea4a9d6428b41e8e4745a4090e916a44fc (diff)
Merge pull request #478 from janisozaur/patch-1
Use Ninja for Travis builds
Diffstat (limited to '.travis')
-rwxr-xr-x.travis/linux/docker.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/.travis/linux/docker.sh b/.travis/linux/docker.sh
index 8a23b54b1..bc541216c 100755
--- a/.travis/linux/docker.sh
+++ b/.travis/linux/docker.sh
@@ -1,7 +1,7 @@
#!/bin/bash -ex
apt-get update
-apt-get install -y build-essential git libqt5opengl5-dev libsdl2-dev libssl-dev python qtbase5-dev wget
+apt-get install -y build-essential git libqt5opengl5-dev libsdl2-dev libssl-dev python qtbase5-dev wget ninja-build
# Get a recent version of CMake
wget https://cmake.org/files/v3.10/cmake-3.10.1-Linux-x86_64.sh
@@ -10,7 +10,7 @@ sh cmake-3.10.1-Linux-x86_64.sh --exclude-subdir --prefix=/ --skip-license
cd /yuzu
mkdir build && cd build
-cmake .. -DYUZU_BUILD_UNICORN=ON -DCMAKE_BUILD_TYPE=Release
-make -j4
+cmake .. -DYUZU_BUILD_UNICORN=ON -DCMAKE_BUILD_TYPE=Release -G Ninja
+ninja
ctest -VV -C Release