diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2017-12-01 00:24:05 -0800 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2017-12-08 17:33:16 +0000 |
| commit | 06250a36a471a151dfe238d7bbf1b1efbca91aac (patch) | |
| tree | 348b220249fa8c774d20ee972c34a9a1de582c2a /tests/auto/blackbox/testdata/symbolLinkMode | |
| parent | 955bfa49711ab3b0d13b081a2d016c3dcf9ce218 (diff) | |
Introduce cpp.rpathOrigin
[ChangeLog] Added property cpp.rpathOrigin which evaluates to
@loader_path on Darwin and $ORIGIN on other Unix-like platforms.
Change-Id: If5770a83ae32f29ee520fd00b07ed8f0caf6bd48
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'tests/auto/blackbox/testdata/symbolLinkMode')
| -rw-r--r-- | tests/auto/blackbox/testdata/symbolLinkMode/symbolLinkMode.qbs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/blackbox/testdata/symbolLinkMode/symbolLinkMode.qbs b/tests/auto/blackbox/testdata/symbolLinkMode/symbolLinkMode.qbs index a95d6015e..127d459c8 100644 --- a/tests/auto/blackbox/testdata/symbolLinkMode/symbolLinkMode.qbs +++ b/tests/auto/blackbox/testdata/symbolLinkMode/symbolLinkMode.qbs @@ -29,7 +29,7 @@ Project { } cpp.cxxLanguageVersion: "c++11" cpp.minimumMacosVersion: "10.5" - cpp.rpaths: qbs.targetOS.contains("darwin") ? ["@loader_path/../lib"] : ["$ORIGIN/../lib"] + cpp.rpaths: [cpp.rpathOrigin + "/../lib"] Group { fileTagsFilter: product.type @@ -50,7 +50,7 @@ Project { files: ["lib.cpp"] cpp.cxxLanguageVersion: "c++11" cpp.minimumMacosVersion: "10.5" - cpp.rpaths: qbs.targetOS.contains("darwin") ? ["@loader_path"] : ["$ORIGIN"] + cpp.rpaths: [cpp.rpathOrigin] Properties { condition: qbs.targetOS.contains("darwin") |