From 395afe59eb816679b4d486a6b7fcd1c6b186febb Mon Sep 17 00:00:00 2001 From: Janek Bevendorff Date: Tue, 27 Feb 2018 19:38:40 +0100 Subject: [PATCH] Update release-tool to use generic /usr/local/opt/qt path on macOS --- release-tool | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/release-tool b/release-tool index c0739a0b4..74f205900 100755 --- a/release-tool +++ b/release-tool @@ -658,17 +658,12 @@ build() { if [ "" == "$DOCKER_IMAGE" ]; then if [ "$(uname -s)" == "Darwin" ]; then # Building on macOS - local qt_vers="$(ls /usr/local/Cellar/qt 2> /dev/null | sort -r | head -n1)" - if [ "" == "$qt_vers" ]; then - exitError "Couldn't find Qt5! Please make sure it is available in '/usr/local/Cellar/qt'." - fi - export MACOSX_DEPLOYMENT_TARGET=10.10 logInfo "Configuring build..." cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" \ - -DCMAKE_PREFIX_PATH="/usr/local/Cellar/qt/${qt_vers}/lib/cmake" \ + -DCMAKE_PREFIX_PATH="/usr/local/opt/qt/lib/cmake" \ ${CMAKE_OPTIONS} "$SRC_DIR" logInfo "Compiling and packaging sources..."