Actually use Qt5 for qt5-osx build
This commit is contained in:
parent
9599fe7b33
commit
5f944f1d6e
2 changed files with 13 additions and 1 deletions
|
@ -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
|
||||
|
|
12
travis-compile.sh
Executable file
12
travis-compile.sh
Executable file
|
@ -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
|
Loading…
Reference in a new issue