Skip to content

Commit 785579d

Browse files
committed
ci(wheels-macos-intel): get rid of unnecessary changes
- revert to deployment target 10.15 - don't use CIBW_ENVIRONMENT to find the C / CXX compiler - unset CMAKE_FIND_FRAMEWORK=NEVER - unset NO_SYSTEM_FROM_IMPORTED=ON Signed-off-by: Zach Lewis <zachcanbereached@gmail.com>
1 parent e91c084 commit 785579d

File tree

2 files changed

+3
-18
lines changed

2 files changed

+3
-18
lines changed

.github/workflows/wheel.yml

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -297,22 +297,7 @@ jobs:
297297
env:
298298
CIBW_BUILD: ${{ matrix.python }}
299299
CIBW_ARCHS: ${{ matrix.arch }}
300-
CIBW_ENVIRONMENT: >
301-
CMAKE_C_COMPILER=$(xcrun -find clang)
302-
CMAKE_CXX_COMPILER=$(xcrun -find clang++)
303-
CMAKE_GENERATOR='Unix Makefiles'
304-
MACOSX_DEPLOYMENT_TARGET=11
305-
USE_Libheif='OFF'
306-
CMAKE_ARGS="-DCMAKE_FIND_FRAMEWORK=NEVER
307-
-DCMAKE_NO_SYSTEM_FROM_IMPORTED=ON
308-
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
309-
-DLINKSTATIC=1
310-
-DIGNORE_HOMEBREWED_DEPS=1
311-
-DCMAKE_FIND_FRAMEWORK=NEVER
312-
-DOpenEXR_DIR=$PWD/deps/dist/lib/cmake/OpenEXR
313-
-DImath_DIR=$PWD/deps/dist/lib/cmake/Imath"
314-
315-
MACOSX_DEPLOYMENT_TARGET: 11
300+
MACOSX_DEPLOYMENT_TARGET: 10.15
316301
CMAKE_GENERATOR: "Unix Makefiles"
317302
# TODO: Re-enable HEIF when we provide a build recipe that does
318303
# not include GPL-licensed dynamic libraries.

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ if.platform-system = "darwin"
9595
if.platform-machine = "x86_64"
9696
inherit.cmake.define = "append"
9797
cmake.define.CMAKE_OSX_ARCHITECTURES = "x86_64"
98-
cmake.define.CMAKE_OSX_DEPLOYMENT_TARGET = "11"
98+
cmake.define.CMAKE_OSX_DEPLOYMENT_TARGET = "10.15"
9999
#cmake.define.CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH = "OFF"
100100
#cmake.define.CMAKE_FIND_USE_CMAKE_ENVIRONMENT_PATH = "OFF"
101101

@@ -112,7 +112,7 @@ skip = [
112112
test-command = "oiiotool --buildinfo"
113113

114114
[tool.cibuildwheel.macos.environment]
115-
SKBUILD_CMAKE_ARGS = "-DLINKSTATIC=1; -DIGNORE_HOMEBREWED_DEPS=1; -DCMAKE_FIND_FRAMEWORK=NEVER"
115+
SKBUILD_CMAKE_ARGS = "-DLINKSTATIC=1; -DIGNORE_HOMEBREWED_DEPS=1"
116116
# Optimize for size (not speed).
117117
SKBUILD_CMAKE_BUILD_TYPE = "MinSizeRel"
118118

0 commit comments

Comments
 (0)