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

Fix qbs build of clangformat plugin

Browse Source 
Change-Id: Ic23a34048c62ed39590ad422ea3e4f8fea9fc5a1
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Alexandru Croitor
2018-09-18 18:06:12 +02:00
committed by Nikolai Kosjar
parent 422da635f7
commit 9da9ed45e9
3 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
qbs/modules/libclang/functions.js
View File

@@ -89,6 +89,31 @@ function libraries(targetOS)
return targetOS.contains("windows") ? ["libclang.lib", "advapi32.lib", "shell32.lib"] : ["clang"]
}
function extraLibraries(llvmConfig, targetOS)
{
var libs = []
if (targetOS.contains("windows"))
libs.push("version");
var dynamicList = readListOutput(llvmConfig, ["--libs"])
.concat(readListOutput(llvmConfig, ["--system-libs"]));
return libs.concat(dynamicList.map(function(s) {
return s.startsWith("-l") ? s.slice(2) : s;
}));
}
function formattingLibs(llvmConfig, targetOS)
{
var fixedList = [
"clangFormat",
"clangToolingCore",
"clangRewrite",
"clangLex",
"clangBasic",
];
return fixedList.concat(extraLibraries(llvmConfig, targetOS));
}
function toolingLibs(llvmConfig, targetOS)
{
var fixedList = [
@@ -108,13 +133,8 @@ function toolingLibs(llvmConfig, targetOS)
"clangLex",
"clangBasic",
];
if (targetOS.contains("windows"))
fixedList.push("version");
var dynamicList = readListOutput(llvmConfig, ["--libs"])
.concat(readListOutput(llvmConfig, ["--system-libs"]));
return fixedList.concat(dynamicList.map(function(s) {
return s.startsWith("-l") ? s.slice(2) : s;
}));
return fixedList.concat(extraLibraries(llvmConfig, targetOS));
}
function toolingParameters(llvmConfig)