diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2017-08-09 00:30:49 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2017-08-09 17:32:26 +0000 |
| commit | a4459844ff4d344cb3c0ec9b97a92bef383d6339 (patch) | |
| tree | 65a4fae02945a2fef112446191cf70008e659e7b /src/libexec | |
| parent | 22ac36861826472f6a572bb9af6c2181d5c63438 (diff) | |
Add an rpath to qbs_processlauncher pointing to the libraries directory
This fixes "standalone" installations of Qbs on macOS where binaries are
using rpath instead of absolute sonames and no DYLD_FRAMEWORK_PATH
environment variable pointing to some Qt installation, is set.
Change-Id: Ie55bb9947de0fa05f2947e4dde1ebf9f2b4d0381
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/libexec')
| -rw-r--r-- | src/libexec/qbs_processlauncher/qbs_processlauncher.qbs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/libexec/qbs_processlauncher/qbs_processlauncher.qbs b/src/libexec/qbs_processlauncher/qbs_processlauncher.qbs index c641296ad..db554f2c7 100644 --- a/src/libexec/qbs_processlauncher/qbs_processlauncher.qbs +++ b/src/libexec/qbs_processlauncher/qbs_processlauncher.qbs @@ -10,6 +10,11 @@ QbsProduct { Depends { name: "Qt.network" } + Properties { + condition: qbs.targetOS.contains("macos") && qbsbuildconfig.enableRPath + cpp.rpaths: ["@loader_path/../../" + qbsbuildconfig.libDirName] + } + cpp.cxxLanguageVersion: "c++11" cpp.includePaths: base.concat(pathToProtocolSources) |