From 9fe8f3b03c029724f2006cd84e572455d093252b Mon Sep 17 00:00:00 2001 From: AnyOldName3 Date: Mon, 1 Sep 2025 18:46:41 +0100 Subject: [PATCH] Attempt to use Qt not necessarily from brew The homebrew package should add qmake to the path, and qmake knows where Qt is. If this works for brew, it should work for not-brew, too. This *might* give a trailing /lib on the path CMake sees, but CMake implicitly tries adding a /lib suffix to paths in CMAKE_PREFIX_PATH, so this shouldn't make a difference to anything. --- CI/before_script.macos.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CI/before_script.macos.sh b/CI/before_script.macos.sh index 15be5eb4e0..3ec72cebaa 100755 --- a/CI/before_script.macos.sh +++ b/CI/before_script.macos.sh @@ -10,11 +10,11 @@ cd build DEPENDENCIES_ROOT="/tmp/openmw-deps" if [[ "${MACOS_AMD64}" ]]; then - QT_PATH=$(arch -x86_64 /usr/local/bin/brew --prefix qt@6) + QT_PATH=$(arch -x86_64 /bin/bash -c "qmake -v | sed -rn -e 's/Using Qt version [.0-9]+ in //p'") ICU_PATH=$(arch -x86_64 /usr/local/bin/brew --prefix icu4c) OPENAL_PATH=$(arch -x86_64 /usr/local/bin/brew --prefix openal-soft) else - QT_PATH=$(brew --prefix qt@6) + QT_PATH=$(qmake -v | sed -rn -e "s/Using Qt version [.0-9]+ in //p") ICU_PATH=$(brew --prefix icu4c) OPENAL_PATH=$(brew --prefix openal-soft) fi