From aecb530df833e663e478e4a6bc14366f9b4553c5 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Mon, 21 Feb 2022 18:16:55 -0600 Subject: [PATCH] Fix up osx-arm64 wheel (#224) * build libspatialindex with MACOS archs * no universal2 for cmake --- .github/workflows/build.yml | 2 +- ci/install_libspatialindex.bash | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 987bc601..27ede224 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -135,7 +135,7 @@ jobs: MACOSX_DEPLOYMENT_TARGET: 10.9 CIBW_BUILD_VERBOSITY_MACOS: 3 CIBW_TEST_SKIP: "*-macosx_arm64 *-macosx_universal2:arm64" - CIBW_ARCHS_MACOS: "x86_64 universal2 arm64" + CIBW_ARCHS_MACOS: "x86_64 arm64" CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: "" CIBW_BEFORE_BUILD_LINUX: "pip install cmake; bash {project}/ci/install_libspatialindex.bash" strategy: diff --git a/ci/install_libspatialindex.bash b/ci/install_libspatialindex.bash index a386ce9b..9df56b25 100755 --- a/ci/install_libspatialindex.bash +++ b/ci/install_libspatialindex.bash @@ -45,7 +45,7 @@ cd build cp "${SL}/CMakeLists.txt" .. -cmake -DCMAKE_BUILD_TYPE=Release .. +cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES="${CIBW_ARCHS_MACOS/ /;}" .. make -j 4 # copy built libraries relative to path of this script