Skip to content
Permalink
Browse files

Fix ninja install

  • Loading branch information...
dcwhite committed Sep 16, 2019
1 parent ef16012 commit 30f077d3ef980558a7d270e6b7256a3ab36aa12e
Showing with 4 additions and 3 deletions.
  1. +3 −2 .travis.yml
  2. +1 −1 scripts/getQt4Mac.sh
@@ -51,9 +51,10 @@ before_install:

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" == "osx" ]]; then travis_wait 30 scripts/getQt4Mac.sh; 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
- 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

script:
- cd bin
@@ -3,4 +3,4 @@
brew tap cartr/qt4 || true
brew tap cartr/qt4
brew tap-pin cartr/qt4
brew install cartr/qt4/qt ninja
brew install cartr/qt4/qt

0 comments on commit 30f077d

Please sign in to comment.
You can’t perform that action at this time.