diff options
author | Eike Ziller <eike.ziller@digia.com> | 2013-04-23 15:41:52 +0200 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-04-25 16:47:26 +0200 |
commit | cba1da46788f4a6e7665788cbc976c34fc9232c1 (patch) | |
tree | 43dd08f68799bba98f9508b403b0a30ed82ad455 /qtcreator.qbs | |
parent | 753dd85162d692525145be19e13765924b777740 (diff) | |
download | qt-creator-cba1da46788f4a6e7665788cbc976c34fc9232c1.tar.gz |
Qbs: fix rpaths and install names (mac)
Needs updated qbs submodule for rpath fixes and installNamePrefix.
Change-Id: I6428409f34e87f299ff2d8c72268bee72c1ba2f2
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'qtcreator.qbs')
-rw-r--r-- | qtcreator.qbs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qtcreator.qbs b/qtcreator.qbs index ba93b13540..96216f1479 100644 --- a/qtcreator.qbs +++ b/qtcreator.qbs @@ -170,7 +170,8 @@ Project { name: project.ide_app_target consoleApplication: qbs.debugInformation - cpp.rpaths: ["$ORIGIN/../lib/qtcreator"] + cpp.rpaths: qbs.targetOS == "mac" ? ["@executable_path/.."] + : ["$ORIGIN/../lib/qtcreator"] cpp.defines: Defaults.defines(qbs) cpp.linkerFlags: { if (qbs.buildVariant == "release" && (qbs.toolchain == "gcc" || qbs.toolchain == "mingw")) |