From 8300306f82e60b312e34d85b40c360dbe820caa4 Mon Sep 17 00:00:00 2001 From: "Bruce B. Lacey" Date: Sun, 5 Mar 2017 17:57:40 -0800 Subject: [PATCH] Use CMAKE_PREFIX_PATH for Qt 5 builds * To obivate creating Qt symlinks in /usr/local and simplify build/install --- .travis.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8e61a381e..9b69f2ce3 100755 --- a/.travis.yml +++ b/.travis.yml @@ -165,13 +165,9 @@ before_install: brew install --verbose --only-dependencies freecad --with-packaging-utils brew install --verbose --only-dependencies freecad --with-packaging-utils #Ensure all dependencies are satisfied - # Qt5: Update and patch the Qt 5 symlinks - brew link --force --overwrite qt@5.6 - sudo ln -f -s /usr/local/Cellar/qt\@5.*/*/mkspecs /usr/local/mkspecs - sudo ln -f -s /usr/local/Cellar/qt\@5.*/*/plugins /usr/local/plugins - - # Qt5: Set Qt5 build flag - export CMAKE_OPTS="${CMAKE_OPTS} -DBUILD_QT5=ON" + # Qt5: Set Qt5 build flag and CMAKE_PREFIX + QT5_CMAKE_PREFIX=$(ls -d $(brew list -1 | grep qt | tail -1 | xargs brew --cellar)/*/lib/cmake) + CMAKE_OPTS="${CMAKE_OPTS} -DBUILD_QT5=ON -DCMAKE_PREFIX_PATH=${QT5_CMAKE_PREFIX}" fi #Install the 3DConnexion frameworks