diff options
| author | 0xd34df00d <0xd34df00d@gmail.com> | 2017-02-02 21:24:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-02 21:24:11 -0500 |
| commit | 9deb86b248fee6bb9bcee14d595a933c8fdc4aa2 (patch) | |
| tree | 89d4a817cd11a61c6927e5719057bef78ea26091 | |
| parent | c22b44605ba7f98dc72414ed5f05b6c0d8ff0af4 (diff) | |
| parent | cae7093639eb1c0a63f7a9f08cfc7c19d1fb0989 (diff) | |
| download | qxmpp-9deb86b248fee6bb9bcee14d595a933c8fdc4aa2.tar.gz | |
Merge pull request #73 from qxmpp-project/test-clang-builds
Test clang builds
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rwxr-xr-x | tests/travis/build-and-test | 5 |
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" |