aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Pek <tehnick-8@yandex.ru>2017-02-02 23:56:35 +0300
committerBoris Pek <tehnick-8@yandex.ru>2017-02-02 23:56:35 +0300
commitcae7093639eb1c0a63f7a9f08cfc7c19d1fb0989 (patch)
treed560018aaa73b5a6e9479480be03011550ef84d6
parent15293eba662b1dbed02ea9dd658e48e3c6d984bd (diff)
downloadqxmpp-cae7093639eb1c0a63f7a9f08cfc7c19d1fb0989.tar.gz
[travis] test builds using clang
-rw-r--r--.travis.yml3
-rwxr-xr-xtests/travis/build-and-test5
2 files changed, 8 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index 6663ac19..af01af38 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,9 @@ sudo: required
dist: trusty
language: cpp
cache: apt
+compiler:
+ - gcc
+ - clang
env:
- QT_SELECT=qt4 ; CONFIG=minimal
- QT_SELECT=qt4 ; CONFIG=minimal-static
diff --git a/tests/travis/build-and-test b/tests/travis/build-and-test
index 2f51f4de..3d6ad4cd 100755
--- a/tests/travis/build-and-test
+++ b/tests/travis/build-and-test
@@ -12,6 +12,11 @@ if [ -n "$CXX" ]; then
QMAKE_ARGS="$QMAKE_ARGS QMAKE_CXX=$CXX"
fi
+if [ "$CXX" = "clang++" ]; then
+ QMAKE_ARGS="$QMAKE_ARGS QMAKE_LINK=clang++"
+ QMAKE_ARGS="$QMAKE_ARGS QMAKE_LINK_SHLIB=clang++"
+fi
+
case "$CONFIG" in
full*)
QMAKE_ARGS="$QMAKE_ARGS QXMPP_USE_DOXYGEN=1 QXMPP_USE_OPUS=1 QXMPP_USE_SPEEX=1 QXMPP_USE_THEORA=1 QXMPP_USE_VPX=1"