From 333eec764451709f80554d62ea69ab28809373c3 Mon Sep 17 00:00:00 2001
From: Piero Toffanin <pt@masseranolabs.com>
Date: Sat, 10 Sep 2022 16:45:16 -0400
Subject: [PATCH] Propagate DYLD_LIBRARY_PATH

---
 opendm/system.py | 5 ++++-
 run.sh           | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/opendm/system.py b/opendm/system.py
index bf5f279a..4feff283 100644
--- a/opendm/system.py
+++ b/opendm/system.py
@@ -81,7 +81,10 @@ def run(cmd, env_paths=[context.superbuild_bin_path], env_vars={}, packages_path
     
     if len(packages_paths) > 0:
         env["PYTHONPATH"] = env.get("PYTHONPATH", "") + sep + sep.join(packages_paths) 
-    
+    if sys.platform == 'darwin':
+        # Propagate DYLD_LIBRARY_PATH
+        cmd = "export DYLD_LIBRARY_PATH=\"%s\" && %s" % (env.get("DYLD_LIBRARY_PATH", ""), cmd)
+
     for k in env_vars:
         env[k] = str(env_vars[k])
 
diff --git a/run.sh b/run.sh
index 34a6a4ab..d9369dad 100755
--- a/run.sh
+++ b/run.sh
@@ -2,6 +2,6 @@
 
 RUNPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$RUNPATH/SuperBuild/install/lib
-export DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH:$RUNPATH/SuperBuild/install/lib
+export DYLD_LIBRARY_PATH=$RUNPATH/SuperBuild/install/lib
 python3 $RUNPATH/run.py "$@"