Move architecture-independent tool installation to common script

This commit is contained in:
AnyOldName3 2025-09-06 00:51:52 +01:00
parent c70a7cd15b
commit ff60b741a7
3 changed files with 3 additions and 4 deletions

View File

@ -5,3 +5,6 @@ if [[ "${MACOS_AMD64}" ]]; then
else
./CI/macos/before_install.arm64.sh
fi
command -v ccache >/dev/null 2>&1 || brew install ccache
command -v cmake >/dev/null 2>&1 || brew install cmake

View File

@ -2,8 +2,6 @@
command -v /usr/local/bin/brew || arch -x86_64 bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
command -v ccache >/dev/null 2>&1 || brew install ccache
command -v cmake >/dev/null 2>&1 || brew install cmake
arch -x86_64 bash -c "command -v qmake >/dev/null 2>&1 && qmake -v | grep -F 'Using Qt version 6.' >/dev/null || /usr/local/bin/brew install qt@6"
arch -x86_64 /usr/local/bin/brew install curl xquartz gd fontconfig freetype harfbuzz brotli openal-soft icu4c yaml-cpp sqlite

View File

@ -3,8 +3,6 @@
brew tap --repair
brew update --quiet
command -v ccache >/dev/null 2>&1 || brew install ccache
command -v cmake >/dev/null 2>&1 || brew install cmake
command -v qmake >/dev/null 2>&1 && qmake -v | grep -F "Using Qt version 6." >/dev/null || brew install qt@6
brew install curl xquartz gd fontconfig freetype harfbuzz brotli openal-soft icu4c yaml-cpp sqlite