From 840a6cd28c7757d1db15ead1bff7551be836bfd7 Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Mon, 18 Jun 2018 19:27:15 +0200 Subject: [PATCH] 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. --- .travis.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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: -- 2.20.1