From 5f944f1d6ea57a324fd67a9e554d4e0dd8c6b340 Mon Sep 17 00:00:00 2001 From: Gavin Bisesi Date: Fri, 14 Nov 2014 16:32:56 -0500 Subject: [PATCH] Actually use Qt5 for qt5-osx build --- .travis.yml | 2 +- travis-compile.sh | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100755 travis-compile.sh diff --git a/.travis.yml b/.travis.yml index 89b71d6a..28eee8f1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,6 @@ os: compiler: - gcc - clang -script: mkdir build && cd build && cmake .. -DWITH_QT4=$QT4 -DWITH_SERVER=1 && make +script: ./travis-compile.sh install: ./travis-dependencies.sh cache: apt diff --git a/travis-compile.sh b/travis-compile.sh new file mode 100755 index 00000000..8da51620 --- /dev/null +++ b/travis-compile.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +set -e + +mkdir build +cd build +prefix="" +if [[ $TRAVIS_OS_NAME == "osx" && $QT4 == 0 ]]; then + prefix="-DCMAKE_PREFIX_PATH=/usr/local/Cellar/qt5/5.3.0/" +fi +cmake .. -DWITH_SERVER=1 -DWITH_QT4=$QT4 $prefix +make