Update .travis.yml

SCIInstitute · Sep 17, 2019 · bcf76c8 · bcf76c8
1 parent 30f077d
commit bcf76c8
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -50,9 +50,10 @@ before_install:
 - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then uname -a; fi
 
 install:
-- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install mesa-common-dev libgl1-mesa-dev mesa-utils-extra libglapi-mesa ninja-build libqt4-dev qt4-qmake libqt4-opengl-dev; fi
-- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ninja; fi
+- if [[ "$QT5" = "OFF" && "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install mesa-common-dev libgl1-mesa-dev mesa-utils-extra libglapi-mesa ninja-build libqt4-dev qt4-qmake libqt4-opengl-dev; fi
+- if [[ "$QT5" = "ON"  && "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install mesa-common-dev libgl1-mesa-dev mesa-utils-extra libglapi-mesa ninja-build qt5-qmake qtbase5-dev; fi
 - if [[ "$QT5" = "OFF" && "$TRAVIS_OS_NAME" == "osx" ]]; then travis_wait 30 scripts/getQt4Mac.sh; fi
+- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ninja; fi
 - if [[ "$QT5" = "ON"  && "$TRAVIS_OS_NAME" == "osx" ]]; then brew install qt || true; fi
 - if [[ "$QT5" = "ON"  && "$TRAVIS_OS_NAME" == "osx" ]]; then brew upgrade qt || true; fi