From cf1aed1ff19da79997ed6eedcde383fd7dd07a3c Mon Sep 17 00:00:00 2001 From: sigseg5 Date: Thu, 18 May 2023 15:24:22 +0400 Subject: [PATCH] Fix macOS build in case QT is installed via brew --- deploy/build_macos.sh | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/deploy/build_macos.sh b/deploy/build_macos.sh index 170f2237..87014248 100755 --- a/deploy/build_macos.sh +++ b/deploy/build_macos.sh @@ -49,7 +49,21 @@ echo "Using QIF in $QIF_BIN_DIR" # Checking env -$QT_BIN_DIR/qt-cmake --version +BREW_BIN_DIR=/opt/homebrew/bin +if "$QT_BIN_DIR"/qt-cmake --version; then + QT_CMAKE=$QT_BIN_DIR/qt-cmake + echo "qt-cmake found at $QT_BIN_DIR/qt-cmake" +else + if $BREW_BIN_DIR/qt-cmake --version; then + QT_CMAKE=$BREW_BIN_DIR/qt-cmake + echo "qt-cmake found at $BREW_BIN_DIR/qt-cmake" + else + echo "'qt_make' not found in $QT_BIN_DIR or $BREW_BIN_DIR directories." + exit 1 + fi +fi + +$QT_CMAKE --version cmake --version clang -v