Update change to runpaths

neutronimaging · Jan 8, 2025 · 5faf234 · 5faf234
1 parent ae418ec
commit 5faf234
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/.github/workflows/Build-multi-OS.yml b/.github/workflows/Build-multi-OS.yml
@@ -149,9 +149,12 @@ jobs:
 
     - name: Ammend shared libraries runpaths
       if: ${{ runner.os == 'Linux' }}
-      working-directory: build-imagingsuite/Release/lib
+      working-directory: build-imagingsuite/Release
       shell: bash
-      run: patchelf --set-rpath '$ORIGIN' *.so*
+      run: |
+        patchelf --set-rpath '$ORIGIN' lib/*.so*
+        patchelf --set-rpath '$ORIGIN:$ORIGIN/../../lib' PlugIns/BackProjectors/*.so*
+        patchelf --set-rpath '$ORIGIN:$ORIGIN/../../lib' PlugIns/Preprocessors/*.so*
 
     - name: Test
       id: tests

diff --git a/.github/workflows/Build-wheels.yml b/.github/workflows/Build-wheels.yml
@@ -165,12 +165,6 @@ jobs:
           ${QTPATH}/bin/macdeployqt imageviewer.app
         fi
 
-    - name: Ammend shared libraries runpaths
-      if: ${{ runner.os == 'Linux' }}
-      working-directory: build-imagingsuite/Release/lib
-      shell: bash
-      run: patchelf --set-rpath '$ORIGIN' *.so*
-
     - name: Copy bindings and shared libraries to package folder
       shell: bash
       working-directory: build-imagingsuite
@@ -188,6 +182,13 @@ jobs:
           cp *.so ../../../imagingsuite/package/pymuhrec
         fi
 
+    - name: Ammend shared libraries runpaths
+      if: ${{ runner.os == 'Linux' }}
+      working-directory: imagingsuite/package/pymuhrec
+      shell: bash
+      run: |
+        patchelf --set-rpath '$ORIGIN' *.so*
+
     - name: Build wheels
       shell: bash
       working-directory: imagingsuite/package

diff --git a/.gitignore b/.gitignore
@@ -30,7 +30,7 @@ cmake_install.cmake
 *.synctex.gz
 .vscode*
 package/pymuhrec/*.dll
-package/pymuhrec/*.so
+package/pymuhrec/*.so*
 package/pymuhrec/*.dylib
 package/pymuhrec/*.pyd
 package/pymuhrec.egg-info