From 5faf234bd21c71be696a34a11edbbab8a458edac Mon Sep 17 00:00:00 2001
From: Christian Vedel <christian.vedel@ess.eu>
Date: Wed, 8 Jan 2025 16:33:32 +0100
Subject: [PATCH] Update change to runpaths

---
 .github/workflows/Build-multi-OS.yml |  7 +++++--
 .github/workflows/Build-wheels.yml   | 13 +++++++------
 .gitignore                           |  2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/Build-multi-OS.yml b/.github/workflows/Build-multi-OS.yml
index f9ed9b29..afd68386 100644
--- 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
index 91794c21..d40b9fa4 100644
--- 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
index 8d8b8a66..e6cf4c59 100644
--- 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