diff options
| author | Jeremy Lainé <jeremy.laine@m4x.org> | 2014-07-21 02:23:56 +0200 |
|---|---|---|
| committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2014-07-21 02:23:56 +0200 |
| commit | b3c174b17a35dd552ef24f9a9a88620a666063dc (patch) | |
| tree | 996deb873efd98f34c365a75a0dda3811bf4e1cc | |
| parent | 114d0c05fe82744967d4b8c8cd294e1d7dc51253 (diff) | |
| parent | 4e8734c75e38be6af4d3882e4858d716317f16cd (diff) | |
| download | qxmpp-b3c174b17a35dd552ef24f9a9a88620a666063dc.tar.gz | |
Merge branch 'master' of github.com:qxmpp-project/qxmpp
| -rwxr-xr-x | tests/travis/build-and-test.sh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/tests/travis/build-and-test.sh b/tests/travis/build-and-test.sh index c1695b61..b0658ec2 100755 --- a/tests/travis/build-and-test.sh +++ b/tests/travis/build-and-test.sh @@ -2,6 +2,16 @@ set -e BUILD_FLAGS="" + +if [ -n "$CC" ]; then + BUILD_FLAGS="$BUILD_FLAGS QMAKE_CC=$CC" +fi + + +if [ -n "$CXX" ]; then + BUILD_FLAGS="$BUILD_FLAGS QMAKE_CXX=$CXX" +fi + case "$CONFIG" in full*) BUILD_FLAGS="$BUILD_FLAGS QXMPP_USE_SPEEX=1 QXMPP_USE_THEORA=1" |