File tree Expand file tree Collapse file tree 2 files changed +7
-7
lines changed
Expand file tree Collapse file tree 2 files changed +7
-7
lines changed Original file line number Diff line number Diff line change @@ -336,9 +336,9 @@ jobs:
336336 run : |
337337 brew install ninja ccache || true
338338
339- - name : Remove brew OpenEXR/Imath
339+ - name : Brew uninstall problematic dependencies
340340 run : |
341- brew uninstall --ignore-dependencies openexr imath || true
341+ brew uninstall --ignore-dependencies openexr imath minizip-ng expat cmake || true
342342
343343 - name : Build wheels
344344 uses : pypa/cibuildwheel@9c00cb4f6b517705a3794b22395aedc36257242c # v3.2.1
Original file line number Diff line number Diff line change 66# OpenColorIO by hand!
77######################################################################
88
9- set_cache (OpenColorIO_BUILD_VERSION 2.4.2 "OpenColorIO version for local builds" )
9+ set_cache (OpenColorIO_BUILD_VERSION 2.5.0 "OpenColorIO version for local builds" )
1010set (OpenColorIO_GIT_REPOSITORY "https://github.com/AcademySoftwareFoundation/OpenColorIO" )
1111set (OpenColorIO_GIT_TAG "v${OpenColorIO_BUILD_VERSION} " )
12- set_cache (OpenColorIO_BUILD_SHARED_LIBS OFF #ON
12+ set_cache (OpenColorIO_BUILD_SHARED_LIBS OFF
1313 DOC "Should a local OpenColorIO build, if necessary, build shared libraries" ADVANCED )
1414# We would prefer to build a static OCIO, but haven't figured out how to make
1515# it all work with the static dependencies, it just makes things complicated
@@ -24,9 +24,9 @@ unset (OPENCOLORIO_VERSION_MINOR)
2424unset (OpenColorIO_DIR)
2525
2626checked_find_package(pystring VERSION_MIN 1.1.3)
27- checked_find_package(expat REQUIRED VERSION_MIN 2.5 )
28- checked_find_package(yaml-cpp REQUIRED VERSION_MIN 0.6 .0)
29- checked_find_package(minizip-ng REQUIRED VERSION_MIN 3 .0.0 )
27+ checked_find_package(expat REQUIRED VERSION_MIN 2.6 )
28+ checked_find_package(yaml-cpp REQUIRED VERSION_MIN 0.8 .0)
29+ checked_find_package(minizip-ng REQUIRED VERSION_MIN 4 .0.10 )
3030
3131string (MAKE_C_IDENTIFIER ${OpenColorIO_BUILD_VERSION} OpenColorIO_VERSION_IDENT)
3232
You can’t perform that action at this time.
0 commit comments