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

qbs build: Make clang plugins build with libclang-cpp

Browse Source 
Change-Id: Ifbae5f2a124e5c36126391d48b0a186bd153d678
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
Christian Kandeler
2020-05-26 10:55:49 +02:00
parent c9672f4ffa
commit a03113832b
2 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -110,11 +110,11 @@ function formattingLibs(llvmConfig, qtcFunctions, targetOS)
return []; return [];
var clangVersion = version(llvmConfig) var clangVersion = version(llvmConfig)
if (Utilities.versionCompare(clangVersion, "10") >= 0)
return [];
var libs = [] var libs = []
if (qtcFunctions.versionIsAtLeast(clangVersion, MinimumLLVMVersion)) { if (qtcFunctions.versionIsAtLeast(clangVersion, MinimumLLVMVersion)) {
if (qtcFunctions.versionIsAtLeast(clangVersion, "8.0.0")) { var hasLibClangFormat = File.directoryEntries(libDir(llvmConfig), File.Files)
.some(function(p) { return p.contains("clangFormat"); });
if (hasLibClangFormat) {
libs.push( libs.push(
"clangFormat", "clangFormat",
"clangToolingInclusions", "clangToolingInclusions",
@@ -124,13 +124,7 @@ function formattingLibs(llvmConfig, qtcFunctions, targetOS)
"clangBasic" "clangBasic"
); );
} else { } else {
libs.push( libs.push("clang-cpp");
"clangFormat",
"clangToolingCore",
"clangRewrite",
"clangLex",
"clangBasic"
);
} }
libs = libs.concat(extraLibraries(llvmConfig, targetOS)); libs = libs.concat(extraLibraries(llvmConfig, targetOS));
} }
@@ -140,7 +134,9 @@ function formattingLibs(llvmConfig, qtcFunctions, targetOS)
function toolingLibs(llvmConfig, targetOS) function toolingLibs(llvmConfig, targetOS)
{ {
var fixedList = [ var hasLibClangTooling = File.directoryEntries(libDir(llvmConfig), File.Files)
.some(function(p) { return p.contains("clangTooling"); });
var fixedList = hasLibClangTooling ? [
"clangTooling", "clangTooling",
"clangFrontend", "clangFrontend",
"clangIndex", "clangIndex",
@@ -156,7 +152,7 @@ function toolingLibs(llvmConfig, targetOS)
"clangAST", "clangAST",
"clangLex", "clangLex",
"clangBasic", "clangBasic",
]; ] : ["clang-cpp"];
return fixedList.concat(extraLibraries(llvmConfig, targetOS)); return fixedList.concat(extraLibraries(llvmConfig, targetOS));
} }

3
qbs/modules/libclang/libclang.qbs
View File

@@ -64,8 +64,7 @@ Module {
return incl != llvmIncludeDir; return incl != llvmIncludeDir;
}) })
property stringList llvmToolingCxxFlags: clangProbe.llvmToolingCxxFlags property stringList llvmToolingCxxFlags: clangProbe.llvmToolingCxxFlags
property bool toolingEnabled: Utilities.versionCompare(llvmVersion, "10") < 0 property bool toolingEnabled: !Environment.getEnv("QTC_DISABLE_CLANG_REFACTORING")
&& !Environment.getEnv("QTC_DISABLE_CLANG_REFACTORING")
validate: { validate: {
if (!clangProbe.found) { if (!clangProbe.found) {