diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-07-10 08:04:39 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-07-10 08:04:59 +0200 |
| commit | f2286a69a98df5d26cf2692ff33e487feafad5ab (patch) | |
| tree | 12b80dc9502568258558434233e55897374cb7ba /contrib | |
| parent | f3330b40a599615f15f585166ef08f00d06e9616 (diff) | |
| parent | 502972f16bae79cf025bf9b63ec8276bc4a236bb (diff) | |
Merge pull request #4190
502972f Fix Error: No file at @loader_path/libboost_system-mt.dylib (Federico Bond)
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/macdeploy/macdeployqtplus | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/macdeploy/macdeployqtplus b/contrib/macdeploy/macdeployqtplus index ce4169a410..fdad28018f 100755 --- a/contrib/macdeploy/macdeployqtplus +++ b/contrib/macdeploy/macdeployqtplus @@ -211,6 +211,7 @@ def getFrameworks(binaryPath, verbose): libraries = [] for line in otoolLines: + line = line.replace("@loader_path", os.path.dirname(binaryPath)) info = FrameworkInfo.fromOtoolLibraryLine(line.strip()) if info is not None: if verbose >= 3: @@ -307,7 +308,7 @@ def deployFrameworks(frameworks, bundlePath, binaryPath, strip, verbose, deploym if deploymentInfo.qtPath is None and framework.isQtFramework(): deploymentInfo.detectQtPath(framework.frameworkDirectory) - if framework.installName.startswith("@executable_path"): + if framework.installName.startswith("@executable_path") or framework.installName.startswith(bundlePath): if verbose >= 2: print framework.frameworkName, "already deployed, skipping." continue |