From 9783b7f099af9a317df33e368eb659a7ec2f218a Mon Sep 17 00:00:00 2001 From: Zach Lewis Date: Tue, 15 Oct 2024 08:02:57 -0400 Subject: [PATCH] ci(wheels): Use CMAKE_IGNORE_PREFIX_PATH instead of uninstalling stuff Signed-off-by: Zach Lewis --- .github/workflows/wheel.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/wheel.yml b/.github/workflows/wheel.yml index b1a3a75584..c56ab4540e 100644 --- a/.github/workflows/wheel.yml +++ b/.github/workflows/wheel.yml @@ -278,9 +278,11 @@ jobs: # TODO: Re-enable HEIF when we provide a build recipe that does # not include GPL-licensed dynamic libraries. USE_Libheif: 'OFF' - # Make sure the OIIO build's version of freetype is linked - CIBW_BEFORE_ALL: | - brew uninstall --ignore-dependencies harfbuzz fontconfig cairo freetype + # Ignore dependencies installed by homebrew (e.g. freetype) + SKBUILD_CMAKE_ARGS: | + -DOpenImageIO_BUILD_LOCAL_DEPS=TIFF; + -DOpenImageIO_BUILD_MISSING_DEPS=all; + -DCMAKE_IGNORE_PREFIX_PATH: /opt/homebrew - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0 with: @@ -338,9 +340,11 @@ jobs: env: CIBW_BUILD: ${{ matrix.python }} CIBW_ARCHS: ${{ matrix.arch }} - # Make sure the OIIO build's version of freetype is linked - CIBW_BEFORE_ALL: | - brew uninstall --ignore-dependencies harfbuzz fontconfig cairo freetype + # Ignore dependencies installed by homebrew (e.g. freetype) + SKBUILD_CMAKE_ARGS: | + -DOpenImageIO_BUILD_LOCAL_DEPS=TIFF; + -DOpenImageIO_BUILD_MISSING_DEPS=all; + -DCMAKE_IGNORE_PREFIX_PATH: /opt/homebrew #TODO: Re-enable the PNG plugin until we can figure out why the system PNG is causing problems ENABLE_PNG: 'OFF'