diff options
| author |  Alexey Sokolov | 2015-10-11 08:51:13 +0100 |
|---|---|---|
| committer | Alexey Sokolov | 2015-10-11 09:22:22 +0100 |
| commit | 905dfe73f0902590b6979eaa508b82544d7f9563 (patch) | |
| tree | a60290ae80be8d317a2920689c10d2fd30257756 | |
| parent | Merge pull request #1664 from blindsighttf2/servers (diff) | |
| download | KVIrc-905dfe73f0902590b6979eaa508b82544d7f9563.tar.gz KVIrc-905dfe73f0902590b6979eaa508b82544d7f9563.tar.bz2 KVIrc-905dfe73f0902590b6979eaa508b82544d7f9563.zip | |
Travis: Add build with KDE.
KDE build is broken right now, and it was not noticed without CI.
[skip appveyor]
| -rw-r--r-- | .travis.yml | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index a106d4a61..9e45e88af 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,14 @@ language: cpp -os: - - linux - - osx -compiler: - - gcc # on osx it's actually clang +matrix: + include: + - os: linux + env: WANT_KDE=NO + compiler: gcc + - os: linux + env: WANT_KDE=YES + compiler: gcc + - os: osx + compiler: clang before_install: - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cat /proc/cpuinfo /proc/meminfo; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then lsb_release -a; fi @@ -12,6 +17,7 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sysctl -a | grep mem; fi - pwd install: + - CMAKE_ARGS="" - | if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then # want cmake newer than in ubuntu 12.04 @@ -20,6 +26,11 @@ install: sudo apt-get install cmake cmake-data sudo apt-get install libperl-dev libenchant-dev + + CMAKE_ARGS="$CMAKE_ARGS -DWANT_KDE=$WANT_KDE" + if [[ "$WANT_KDE" == "YES" ]]; then + sudo apt-get install kdelibs5-dev + fi fi - | if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then @@ -29,7 +40,7 @@ install: script: - mkdir build - cd build - - cmake .. + - cmake $CMAKE_ARGS .. - make -j3 - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo make install; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then make install; fi |