diff options
| author | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-07-13 17:22:30 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-07-14 08:56:41 +0000 |
| commit | 4d812390512771c53ecd176612f0dbbdc7f8177f (patch) | |
| tree | bc2222e4ae38b89128dabbad4575243144938fa4 /qbs | |
| parent | c3192d908bf2d2575d93b49733b6dce9d6cca2bb (diff) | |
Adapt RPATHs to new libexec path.
Task-number: QTCREATORBUG-14725
Change-Id: I4b5c76faa878897ca7fbf1fe01945550a2d82964
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Diffstat (limited to 'qbs')
| -rw-r--r-- | qbs/imports/QtcTool.qbs | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/qbs/imports/QtcTool.qbs b/qbs/imports/QtcTool.qbs index 9000f76b1e..4870a65815 100644 --- a/qbs/imports/QtcTool.qbs +++ b/qbs/imports/QtcTool.qbs @@ -1,10 +1,19 @@ -import qbs 1.0 +import qbs +import qbs.FileInfo QtcProduct { type: "application" // no Mac app bundle installDir: project.ide_libexec_path - cpp.rpaths: qbs.targetOS.contains("osx") - ? ["@executable_path/../" + project.ide_library_path] - : ["$ORIGIN/../" + project.ide_library_path] + cpp.rpaths: { + var relativePathToLibs + = FileInfo.relativePath(project.ide_libexec_path, project.ide_library_path); + var relativePathToPlugins + = FileInfo.relativePath(project.ide_libexec_path, project.ide_plugin_path); + var prefix = qbs.targetOS.contains("osx") ? "@executable_path" : "$ORIGIN"; + return [ + FileInfo.joinPaths(prefix, relativePathToLibs), + FileInfo.joinPaths(prefix, relativePathToPlugins) + ]; + } } |