Commit 98d8ebfb authored by Christian Kandeler's avatar Christian Kandeler
Browse files

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: default avatarJake Petroules <jake.petroules@petroules.com>
parent 724d2fc4
......@@ -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: [
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment