From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Mon, 18 Jun 2018 17:27:15 +0000 (+0200)
Subject: travis: Add jobs for building against KDE Frameworks
X-Git-Tag: travis-deploy-test~1
X-Git-Url: https://git.quassel-irc.org/?a=commitdiff_plain;ds=sidebyside;h=840a6cd28c7757d1db15ead1bff7551be836bfd7;p=quassel.git

travis: Add jobs for building against KDE Frameworks

Define CMake options in a more generic way, and use this to define
builds against KDE Frameworks.
---

diff --git a/.travis.yml b/.travis.yml
index cf220371..f0bf2f08 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,8 +8,10 @@ os: linux
 language: generic  # No host compilation
 
 env:
-  - DIST=xenial CXX=gcc
-  - DIST=xenial CXX=clang
+  - DIST=xenial CXX=gcc   CMAKE_OPTIONS="-DWITH_KDE=OFF -DWITH_WEBKIT=ON"
+  - DIST=xenial CXX=gcc   CMAKE_OPTIONS="-DWITH_KDE=ON  -DWITH_WEBKIT=ON"
+  - DIST=xenial CXX=clang CMAKE_OPTIONS="-DWITH_KDE=OFF -DWITH_WEBKIT=ON"
+  - DIST=xenial CXX=clang CMAKE_OPTIONS="-DWITH_KDE=ON  -DWITH_WEBKIT=ON"
 
 # Set up cache
 cache:
@@ -33,11 +35,11 @@ script:
                -e CCACHE_DIR=/ccache \
                -e CC=$CXX -e CXX=$CXX \
                quassel/quassel-build-env:$DIST \
-               sh -c 'cmake -GNinja /src \
+               sh -c "cmake -GNinja /src $CMAKE_OPTIONS \
                             -DCMAKE_BUILD_TYPE=RelWithDebInfo \
                       && ninja \
                       && ccache -s \
-                     '
+                     "
 
 # Define a separate job for OSX
 jobs: