From 97d52668ccc2c627665e1811e976c1183119fe75 Mon Sep 17 00:00:00 2001 From: Eugene Shalygin Date: Tue, 11 Apr 2017 13:24:38 +0200 Subject: [PATCH] travis: fix CMake + OSX build Brew changed installation dir for Qt, and we have to change it in our workaround symlinks too. --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9a5a4e7be..399682446 100644 --- a/.travis.yml +++ b/.travis.yml @@ -150,9 +150,8 @@ install: if [ "$build_system" = "cmake" ]; then brew install qt5 ; brew link --force qt5 ; - export HOMEBREW_QT5_VERSION=$(brew list --versions qt5 | rev | cut -d' ' -f1 | rev) - ln -s /usr/local/Cellar/qt5/$HOMEBREW_QT5_VERSION/mkspecs /usr/local/mkspecs - ln -s /usr/local/Cellar/qt5/$HOMEBREW_QT5_VERSION/plugins /usr/local/plugins + ln -s /usr/local/opt/qt/mkspecs /usr/local/mkspecs + ln -s /usr/local/opt/qt/plugins /usr/local/plugins else # Qt # Copy custom qt5 bottle to homebrew's cache so it can find and install it