debug macos repair

karosc · Sep 7, 2023 · b2749b9 · b2749b9
1 parent 54976a8
commit b2749b9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml
@@ -53,6 +53,11 @@ jobs:
         env:
           CIBW_TEST_COMMAND: "pytest {package}/tests"
           CIBW_BEFORE_TEST: pip install -r {package}/test-requirements.txt
+
+          CIBW_REPAIR_WHEEL_COMMAND_MACOS: >
+            export REPAIR_LIBRARY_PATH="$(cat ./swmm-toolkit/_skbuild/bindir)/_deps/openmp-build/runtime/src" &&
+            DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel}
+
           # mac needs ninja to build
           CIBW_BEFORE_BUILD_MACOS: brew install ninja
           # configure cibuildwheel to build native archs ('auto'), and some emulated ones      
@@ -103,6 +108,10 @@ jobs:
         env:
           # mac needs ninja to build
           CIBW_BEFORE_BUILD_MACOS: brew install ninja
+          CIBW_REPAIR_WHEEL_COMMAND_MACOS: >
+            export REPAIR_LIBRARY_PATH="$(cat ./swmm-toolkit/_skbuild/bindir)/_deps/openmp-build/runtime/src" &&
+            DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel}
+            
           # configure cibuildwheel to build native archs ('auto'), and some emulated ones      
           CIBW_ARCHS_LINUX: aarch64
           CIBW_ARCHS_MACOS: arm64  

diff --git a/swmm-toolkit/extern/openmp.cmake b/swmm-toolkit/extern/openmp.cmake
@@ -43,4 +43,6 @@ install(TARGETS omp
     LIBRARY
     DESTINATION
         "${LIBRARY_DIST}"
-)
+)
+
+file(WRITE _skbuild/bindir ${CMAKE_BINARY_DIR})