kopia lustrzana https://github.com/OpenDroneMap/ODM
Propagate DYLD_LIBRARY_PATH
rodzic
643ea4eee6
commit
333eec7644
|
@ -81,7 +81,10 @@ def run(cmd, env_paths=[context.superbuild_bin_path], env_vars={}, packages_path
|
||||||
|
|
||||||
if len(packages_paths) > 0:
|
if len(packages_paths) > 0:
|
||||||
env["PYTHONPATH"] = env.get("PYTHONPATH", "") + sep + sep.join(packages_paths)
|
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:
|
for k in env_vars:
|
||||||
env[k] = str(env_vars[k])
|
env[k] = str(env_vars[k])
|
||||||
|
|
||||||
|
|
2
run.sh
2
run.sh
|
@ -2,6 +2,6 @@
|
||||||
|
|
||||||
RUNPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
RUNPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||||
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$RUNPATH/SuperBuild/install/lib
|
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 "$@"
|
python3 $RUNPATH/run.py "$@"
|
||||||
|
|
||||||
|
|
Ładowanie…
Reference in New Issue