Skip to content

Commit

Permalink
CMAKE_INSTALL_RPATH_USE_LINK_PATH
Browse files Browse the repository at this point in the history
  • Loading branch information
ahnaf-tahmid-chowdhury committed Jun 7, 2024
1 parent 67009af commit 0d0f238
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
11 changes: 8 additions & 3 deletions .github/workflows/build_wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,13 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-13, macos-14]
include:
- os: ubuntu-latest
arch: manylinux_x86_64
- os: macos-13
arch: macosx_x86_64
- os: macos-14
arch: macosx_arm64

steps:
- name: Checkout repository
Expand All @@ -32,7 +38,7 @@ jobs:
- name: Build wheels
uses: pypa/cibuildwheel@v2.18.0
env:
CIBW_BUILD: "cp*"
CIBW_BUILD: "cp*-${{ matrix.arch }}"
CIBW_ARCHS_LINUX: "x86_64"
CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28
CIBW_ARCHS_MACOS: "native"
Expand All @@ -41,7 +47,6 @@ jobs:
CIBW_ENVIRONMENT_MACOS: >
SKBUILD_DOWNLOAD_LAPACK=OFF
CMAKE_Fortran_COMPILER=gfortran-14
DYLD_LIBRARY_PATH=/usr/local/Cellar/gcc/14.1.0/lib/gcc/current/:$DYLD_LIBRARY_PATH
CIBW_BUILD_FRONTEND: "build"
with:
package-dir: .
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/quick_wheel_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ jobs:
echo "FC=$(which gfortran-14)" >> $GITHUB_ENV
# hdf5 is needed for building tables
brew install hdf5
# ISSUE: DYLD_LIBRARY_PATH for 14.1 on Intel macOS
echo "DYLD_LIBRARY_PATH=/usr/local/Cellar/gcc/14.1.0/lib/gcc/current/:$DYLD_LIBRARY_PATH" >> $GITHUB_ENV
- name: Set up Python
uses: actions/setup-python@v5
Expand Down
1 change: 1 addition & 0 deletions cmake/PyneMacros.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ endmacro()
macro(pyne_configure_rpath)
if(APPLE)
set(CMAKE_MACOSX_RPATH ON)
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH ON)
set(RPATH "@loader_path")
elseif(UNIX)
set(RPATH "$ORIGIN")
Expand Down

0 comments on commit 0d0f238

Please sign in to comment.