mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-06-11 16:44:48 -07:00
Refine travis config to only install qt4 or qt5 per build instead of both
This commit is contained in:
parent
a91106f90e
commit
e918900d4e
2 changed files with 17 additions and 8 deletions
|
|
@ -1,13 +1,13 @@
|
||||||
language: cpp
|
language: cpp
|
||||||
env:
|
env:
|
||||||
- QT="-DWITH_QT4=0"
|
- QT4=1
|
||||||
- QT="-DWITH_QT4=1"
|
- QT4=0
|
||||||
os:
|
os:
|
||||||
- linux
|
- linux
|
||||||
- osx
|
- osx
|
||||||
compiler:
|
compiler:
|
||||||
- gcc
|
- gcc
|
||||||
- clang
|
- clang
|
||||||
script: mkdir build && cd build && cmake .. $QT -DWITH_SERVER=1 && make
|
script: mkdir build && cd build && cmake .. -DWITH_QT4=$QT4 -DWITH_SERVER=1 && make
|
||||||
install: ./travis-dependencies.sh
|
install: ./travis-dependencies.sh
|
||||||
cache: apt
|
cache: apt
|
||||||
|
|
|
||||||
|
|
@ -2,10 +2,19 @@
|
||||||
|
|
||||||
if [[ $TRAVIS_OS_NAME == "osx" ]] ; then
|
if [[ $TRAVIS_OS_NAME == "osx" ]] ; then
|
||||||
brew update
|
brew update
|
||||||
brew install qt qt5 protobuf libgcrypt
|
if (( QT4 )); then
|
||||||
|
brew install qt protobuf libgcrypt
|
||||||
|
else
|
||||||
|
brew install qt qt5 protobuf libgcrypt
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
sudo add-apt-repository --yes ppa:ubuntu-sdk-team/ppa
|
if (( QT4 )); then
|
||||||
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
|
||||||
qtbase5-dev qtdeclarative5-dev libqt5webkit5-dev libsqlite3-dev qt5-default qttools5-dev-tools
|
else
|
||||||
|
sudo add-apt-repository --yes ppa:ubuntu-sdk-team/ppa
|
||||||
|
sudo apt-get update -qq
|
||||||
|
sudo apt-get install -y libprotobuf-dev protobuf-compiler qtbase5-dev\
|
||||||
|
qtdeclarative5-dev libqt5webkit5-dev libsqlite3-dev qt5-default qttools5-dev-tools
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue