diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2014-06-19 15:06:01 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-06-19 16:26:52 +0200 |
| commit | 98d8ebfb0dd3f8a7eb800edbc4e56693e2da4281 (patch) | |
| tree | 0faf8a60537f11325daabfebc0fcfd7ddde51043 | |
| parent | 724d2fc4bf2674a0d52d82738792d55a2a206bc0 (diff) | |
QbsProjectManager: Do not assume "lib" directory name for external qbs.
While it is technically not required that project.libDirName matches the
external library directory name, other combinations seem quite silly. In
practice, they should either both be "lib" or both be "lib64".
Change-Id: Ib8ecba846787f7791a0b6bd57cdfc2df024dbb3b
Task-number: QBS-627
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
| -rw-r--r-- | src/plugins/qbsprojectmanager/qbsprojectmanager.qbs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanager.qbs b/src/plugins/qbsprojectmanager/qbsprojectmanager.qbs index 4ef8fee1fbe..34045324f5c 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectmanager.qbs +++ b/src/plugins/qbsprojectmanager/qbsprojectmanager.qbs @@ -9,9 +9,7 @@ QtcPlugin { property var externalQbsIncludes: project.useExternalQbs ? [project.qbs_install_dir + "/include/qbs"] : [] property var externalQbsLibraryPaths: project.useExternalQbs - ? [project.qbs_install_dir + "/lib"] : [] - property var externalQbsRPaths: project.useExternalQbs - ? [project.qbs_install_dir + "/lib"] : [] + ? [project.qbs_install_dir + '/' + project.libDirName] : [] property var externalQbsDynamicLibraries: { var libs = [] if (!project.useExternalQbs) @@ -61,7 +59,7 @@ QtcPlugin { ]) cpp.includePaths: base.concat(externalQbsIncludes) cpp.libraryPaths: base.concat(externalQbsLibraryPaths) - cpp.rpaths: base.concat(externalQbsRPaths) + cpp.rpaths: base.concat(externalQbsLibraryPaths) cpp.dynamicLibraries: base.concat(externalQbsDynamicLibraries) files: [ |