From 66f06eb9a8e096c346630323a6d15f559be50420 Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Mon, 18 Jun 2018 19:27:15 +0200 Subject: [PATCH 1/1] 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 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 83b3e034..771519eb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,10 @@ os: linux language: generic # No host compilation env: - - DIST=xenial CXX=g++ - - DIST=xenial CXX=clang++ + - DIST=xenial CXX=g++ CMAKE_OPTIONS="-DWITH_KDE=OFF -DWITH_WEBKIT=ON" + - DIST=xenial CXX=g++ 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,7 +35,7 @@ script: -e CCACHE_DIR=/ccache \ -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 install \ && ccache -s \ -- 2.20.1