diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-05-19 13:50:55 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-06-26 13:48:27 +0200 |
| commit | 272176ca0b9c0315f1b62dfba80e11cbb6e098b6 (patch) | |
| tree | 0222aa9ab98c65da00808ab9c86c22876689a7a0 /qbs | |
| parent | 55b61e34d6422a528ce177ed37796d1be575d66c (diff) | |
QbsProjectManager: Fix rpath on OS X.
Task-number: QTCREATORBUG-12473
Change-Id: Ia470605c1e975c0697d25734bdc7e11d19ac7944
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Diffstat (limited to 'qbs')
| -rw-r--r-- | qbs/imports/QtcPlugin.qbs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/qbs/imports/QtcPlugin.qbs b/qbs/imports/QtcPlugin.qbs index 14d8f909fe..ff06cdfa54 100644 --- a/qbs/imports/QtcPlugin.qbs +++ b/qbs/imports/QtcPlugin.qbs @@ -25,8 +25,9 @@ QtcProduct { cpp.defines: base.concat([name.toUpperCase() + "_LIBRARY"]) cpp.installNamePrefix: "@rpath/PlugIns/" - cpp.rpaths: qbs.targetOS.contains("osx") ? ["@loader_path/..", "@executable_path/.."] - : ["$ORIGIN", "$ORIGIN/.."] + cpp.rpaths: qbs.targetOS.contains("osx") + ? ["@loader_path/..", "@loader_path/", "@executable_path/.."] + : ["$ORIGIN", "$ORIGIN/.."] cpp.linkerFlags: { var flags = base; if (qbs.buildVariant == "debug" && qbs.toolchain.contains("msvc")) |