suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use CMAKE_PREFIX_PATH for Qt 5 builds

Browse Source 
* To obivate creating Qt symlinks in /usr/local and simplify
    build/install
This commit is contained in:
Bruce B. Lacey 2017-03-05 17:57:40 -08:00 committed by Yorik van Havre
parent 17d2f2b458
commit 8300306f82
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.travis.yml
View File

@ -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