feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QbsProjectManager: Do not assume "lib" directory name for external qbs.

Browse Source 
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>
This commit is contained in:
Christian Kandeler
2014-06-19 15:06:01 +02:00
parent 724d2fc4bf
commit 98d8ebfb0d
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qbsprojectmanager/qbsprojectmanager.qbs
View File

@@ -9,9 +9,7 @@ QtcPlugin {
property var externalQbsIncludes: project.useExternalQbs property var externalQbsIncludes: project.useExternalQbs
? [project.qbs_install_dir + "/include/qbs"] : [] ? [project.qbs_install_dir + "/include/qbs"] : []
property var externalQbsLibraryPaths: project.useExternalQbs property var externalQbsLibraryPaths: project.useExternalQbs
? [project.qbs_install_dir + "/lib"] : [] ? [project.qbs_install_dir + '/' + project.libDirName] : []
property var externalQbsRPaths: project.useExternalQbs
? [project.qbs_install_dir + "/lib"] : []
property var externalQbsDynamicLibraries: { property var externalQbsDynamicLibraries: {
var libs = [] var libs = []
if (!project.useExternalQbs) if (!project.useExternalQbs)
@@ -61,7 +59,7 @@ QtcPlugin {
]) ])
cpp.includePaths: base.concat(externalQbsIncludes) cpp.includePaths: base.concat(externalQbsIncludes)
cpp.libraryPaths: base.concat(externalQbsLibraryPaths) cpp.libraryPaths: base.concat(externalQbsLibraryPaths)
cpp.rpaths: base.concat(externalQbsRPaths) cpp.rpaths: base.concat(externalQbsLibraryPaths)
cpp.dynamicLibraries: base.concat(externalQbsDynamicLibraries) cpp.dynamicLibraries: base.concat(externalQbsDynamicLibraries)
files: [ files: [