Use ninja build system for the cmake-linux build.

2 files changed, 8 insertions, 5 deletions

diff --git a/.travis.yml b/.travis.yml
index a717fe85..17a22e79 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,12 +2,13 @@
 # For Pull Requests, we build only the first three jobs: autotools on Linux,
 # cmake on Linux, and cmake on Windows 32 bit.
 #
-# For branch builds and cron builds (once a day), we build all the jobs. This
-# is achieved using the "if: type IN (push, api, cron)" fields in the matrix.
+# For branch builds and cron builds (once a day), we build all the jobs. This is
+# achieved using the "if: type IN (push, api, cron)" fields in the jobs list.
 
 language: c
+os: linux
 
-matrix:
+jobs:
   include:
     - stage: "Stage 1"
       env: JOB=cmake-linux
@@ -19,6 +20,7 @@ matrix:
             - libopus-dev            # For toxav.
             - libgtest-dev           # For unit tests.
             - libvpx-dev             # For toxav.
+            - ninja-build
             - pylint
       install:       .travis/$JOB install
       script:        .travis/$JOB script
diff --git a/.travis/cmake-linux b/.travis/cmake-linux
index 1d425e54..9b2a1fae 100755
--- a/.travis/cmake-linux
+++ b/.travis/cmake-linux
@@ -87,7 +87,7 @@ travis_script() {
 
   other/analysis/check_logger_levels
 
-  cmake -B_build -H. \
+  cmake -B_build -H. -GNinja \
     -DCMAKE_C_FLAGS="$C_FLAGS" \
     -DCMAKE_CXX_FLAGS="$CXX_FLAGS" \
     -DCMAKE_EXE_LINKER_FLAGS="$LD_FLAGS" \
@@ -100,8 +100,9 @@ travis_script() {
     -DUSE_IPV6=OFF \
     -DAUTOTEST=ON
 
+  cmake --build _build --parallel "$NPROC" --target install -- -k 0
+
   cd _build  # pushd
-  make "-j$NPROC" -k install
   ctest -j50 --output-on-failure || \
     ctest -j50 --output-on-failure --rerun-failed
   cd -  # popd