X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=.travis.yml;h=11f02ffddbc84ff8fa907630981e94e989ef3dff;hp=bc92eacc7f756a917128e0238acdeec72334abda;hb=27fe4e6f46547c45d19fa39c175fa2104a5feb28;hpb=644305459a762c910c808bd6b0b64143da275228 diff --git a/.travis.yml b/.travis.yml index bc92eacc..11f02ffd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,17 +45,17 @@ script: |- cd build if [ "$TRAVIS_OS_NAME" == "linux" ] then - if [ "$QT_VERSION" = "qt4" ]; then cmake ..; fi - if [ "$QT_VERSION" = "qt5" ]; then cmake -DUSE_QT5=ON ..; fi + if [ "$QT_VERSION" = "qt4" ]; then cmake -DUSE_QT4=ON ..; fi + if [ "$QT_VERSION" = "qt5" ]; then cmake ..; fi make elif [ "$TRAVIS_OS_NAME" == "osx" ] then if [[ "$TRAVIS_TAG" != "" && "$GH_TOKEN" != "" ]] then PATH=$PATH:/usr/local/opt/qt5/bin - cmake -G"Ninja" .. -DCMAKE_BUILD_TYPE=Release -DUSE_QT5=ON -DWANT_CORE=ON -DWANT_QTCLIENT=ON -DWANT_MONO=ON -DDEPLOY=ON -DCMAKE_PREFIX_PATH=/usr/local/opt/qt5 + cmake -G"Ninja" .. -DCMAKE_BUILD_TYPE=Release -DWANT_CORE=ON -DWANT_QTCLIENT=ON -DWANT_MONO=ON -DDEPLOY=ON -DCMAKE_PREFIX_PATH=/usr/local/opt/qt5 else - cmake -G"Ninja" .. -DCMAKE_BUILD_TYPE=Release -DUSE_QT5=ON -DWANT_CORE=ON -DWANT_QTCLIENT=ON -DWANT_MONO=ON -DCMAKE_PREFIX_PATH=/usr/local/opt/qt5 + cmake -G"Ninja" .. -DCMAKE_BUILD_TYPE=Release -DWANT_CORE=ON -DWANT_QTCLIENT=ON -DWANT_MONO=ON -DCMAKE_PREFIX_PATH=/usr/local/opt/qt5 fi ninja install fi