Skip to content

Commit 87bca92

Browse files
committed
Merge branch 'macos-remove-brew-installs' into 'master'
MacOS CI Scripts - remove brew installs See merge request OpenMW/openmw!5171
2 parents 4d8c660 + a06e855 commit 87bca92

File tree

3 files changed

+2
-2
lines changed

3 files changed

+2
-2
lines changed

AUTHORS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,7 @@ Packagers
285285
Kenny Armstrong (artorius) - Fedora Linux
286286
Nikolay Kasyanov (corristo) - Mac OS X
287287
Sandy Carter (bwrsandman) - Arch Linux
288+
Sarah Sunday (ssunday) - MacOS
288289

289290
Public Relations and Translations
290291
---------------------------------

CI/before_install.macos.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,10 @@ if [[ "${MACOS_AMD64}" ]]; then
1212
command -v /usr/local/bin/brew || arch -x86_64 bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
1313

1414
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"
15-
arch -x86_64 /usr/local/bin/brew install fontconfig yaml-cpp sqlite
1615
else
1716
VCPKG_FILE="vcpkg-arm64-osx-dynamic"
1817

1918
command -v qmake >/dev/null 2>&1 && qmake -v | grep -F "Using Qt version 6." >/dev/null || brew install qt@6
20-
brew install fontconfig yaml-cpp sqlite
2119
fi
2220

2321
curl "https://gitlab.com/OpenMW/openmw-deps/-/raw/main/macos/${VCPKG_FILE}-${VCPKG_TAG}-manifest.txt" -o openmw-manifest.txt

CI/before_script.macos.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ declare -a CMAKE_CONF_OPTS=(
8484
-D CMAKE_CXX_FLAGS="-stdlib=libc++"
8585
-D CMAKE_C_COMPILER="clang"
8686
-D CMAKE_CXX_COMPILER="clang++"
87+
-DOPENMW_USE_SYSTEM_YAML_CPP=OFF
8788
-D OPENMW_OSX_DEPLOYMENT=TRUE
8889
)
8990

0 commit comments

Comments
 (0)