aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Attempt to get travis compile using qt5.2

Browse source
This commit is contained in:
Fabio Bas 2015-02-19 14:45:38 +01:00
parent 569180799d
commit 4de9da8b2b
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
travis-compile.sh
View file

@ -8,5 +8,8 @@ prefix=""
if [[ $TRAVIS_OS_NAME == "osx" && $QT4 == 0 ]]; then if [[ $TRAVIS_OS_NAME == "osx" && $QT4 == 0 ]]; then
prefix="-DCMAKE_PREFIX_PATH=/usr/local/Cellar/qt5/5.4.0/" prefix="-DCMAKE_PREFIX_PATH=/usr/local/Cellar/qt5/5.4.0/"
fi fi
if [[ $TRAVIS_OS_NAME == "linux" && $QT4 == 0 ]]; then
prefix="-DCMAKE_PREFIX_PATH=/opt/qt52/lib/cmake/"
fi
cmake .. -DWITH_SERVER=1 -DWITH_QT4=$QT4 $prefix cmake .. -DWITH_SERVER=1 -DWITH_QT4=$QT4 $prefix
make -j2 make -j2

7
travis-dependencies.sh
View file

@ -12,10 +12,9 @@ else
sudo apt-get update -qq sudo apt-get update -qq
sudo apt-get install -y qtmobility-dev libprotobuf-dev protobuf-compiler libqt4-dev sudo apt-get install -y qtmobility-dev libprotobuf-dev protobuf-compiler libqt4-dev
else else
sudo add-apt-repository --yes ppa:ubuntu-sdk-team/ppa sudo add-apt-repository --yes ppa:beineri/opt-qt521
sudo apt-get update -qq sudo apt-get update -qq
sudo apt-get install -y libprotobuf-dev protobuf-compiler qtbase5-dev cmake\ sudo apt-get install -y libprotobuf-dev protobuf-compiler cmake libsqlite3-dev\
qtdeclarative5-dev libqt5webkit5-dev libsqlite3-dev qt5-default qttools5-dev-tools\ qt52base qt52webkit qt52tools qt52svg
qttools5-dev qtmultimedia5-dev libqt5svg5-dev
fi fi
fi fi