Skip to content

Commit 83dbb11

Browse files
authored
Merge pull request #291 from murraystevenson/macCleanup
CI : macOS cleanup
2 parents efc1581 + 7883691 commit 83dbb11

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

.github/workflows/main.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,13 @@ jobs:
8080

8181
- name: Install toolchain (macOS)
8282
run: |
83+
# Remove all pre-installed homebrew packages.
84+
brew remove --force $(brew list --formula)
85+
brew remove --cask --force $(brew list)
8386
# Install build requirements.
87+
brew install pipx
8488
pipx install scons==4.6.0
89+
brew install ninja
8590
brew install gpatch
8691
echo "/opt/homebrew/opt/gpatch/libexec/gnubin" >> $GITHUB_PATH
8792
brew install bison
@@ -94,10 +99,7 @@ jobs:
9499
# our selected Xcode version.
95100
sudo rm -rf /Library/Developer/CommandLineTools
96101
sudo rm -rf /Applications/Python\ 3.11
97-
# Remove little-cms2 to prevent our LibRaw builds from finding it.
98-
brew uninstall --ignore-dependencies little-cms2
99102
# Pin CMake to 3.31.6
100-
brew uninstall cmake
101103
brew tap-new --no-git "local/pinned" >/dev/null
102104
cmakeDir="$(brew --repo "local/pinned")/Formula"
103105
mkdir -p "$cmakeDir"

OpenImageIO/config.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
" -D CMAKE_INSTALL_PREFIX={buildDir}"
2929
" -D CMAKE_INSTALL_LIBDIR={buildDir}/lib"
3030
" -D CMAKE_PREFIX_PATH={buildDir}"
31+
" -D CMAKE_FIND_FRAMEWORK=LAST"
3132
" -D USE_FFMPEG=NO"
3233
" -D USE_GIF=0"
3334
" -D USE_OPENVDB=NO"

0 commit comments

Comments
 (0)