summaryrefslogtreecommitdiff
path: root/src/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/clangcodemodel/clangcodemodel.qbs13
-rw-r--r--src/plugins/clangpchmanager/clangpchmanager.qbs15
-rw-r--r--src/plugins/clangrefactoring/clangrefactoring.qbs15
-rw-r--r--src/plugins/clangtools/clangtools.qbs16
-rw-r--r--src/plugins/projectexplorer/projectexplorer.qbs12
5 files changed, 11 insertions, 60 deletions
diff --git a/src/plugins/clangcodemodel/clangcodemodel.qbs b/src/plugins/clangcodemodel/clangcodemodel.qbs
index ea494fca2b..20e0cb269d 100644
--- a/src/plugins/clangcodemodel/clangcodemodel.qbs
+++ b/src/plugins/clangcodemodel/clangcodemodel.qbs
@@ -11,7 +11,9 @@ QtcPlugin {
Depends { name: "TextEditor" }
Depends { name: "Utils" }
Depends { name: "ClangSupport" }
+
Depends { name: "libclang"; required: false }
+ Depends { name: "clang_defines" }
pluginTestDepends: [
"CppEditor",
@@ -20,17 +22,6 @@ QtcPlugin {
condition: libclang.present
- cpp.defines: {
- var defines = base;
- // The following defines are used to determine the clang include path for intrinsics.
- defines.push('CLANG_VERSION="' + libclang.llvmVersion + '"');
- var resourceDir = FileInfo.joinPaths(libclang.llvmLibDir, "clang", libclang.llvmVersion,
- "include");
- defines.push('CLANG_RESOURCE_DIR="' + resourceDir + '"');
- defines.push('CLANG_BINDIR="' + libclang.llvmBinDir + '"');
- return defines;
- }
-
files: [
"clangactivationsequencecontextprocessor.cpp",
"clangactivationsequencecontextprocessor.h",
diff --git a/src/plugins/clangpchmanager/clangpchmanager.qbs b/src/plugins/clangpchmanager/clangpchmanager.qbs
index 8e7c5447a6..8c22188633 100644
--- a/src/plugins/clangpchmanager/clangpchmanager.qbs
+++ b/src/plugins/clangpchmanager/clangpchmanager.qbs
@@ -5,6 +5,7 @@ QtcPlugin {
name: "ClangPchManager"
Depends { name: "libclang"; required: false }
+ Depends { name: "clang_defines" }
condition: libclang.present && libclang.toolingEnabled
Depends { name: "ClangSupport" }
@@ -14,19 +15,7 @@ QtcPlugin {
Depends { name: "CppTools" }
Depends { name: "ProjectExplorer" }
- cpp.defines: {
- var defines = base;
- defines.push("CLANGPCHMANAGER_LIB");
-
- // The following defines are used to determine the clang include path for intrinsics.
- defines.push('CLANG_VERSION="' + libclang.llvmVersion + '"');
- var resourceDir = FileInfo.joinPaths(libclang.llvmLibDir, "clang", libclang.llvmVersion,
- "include");
- defines.push('CLANG_RESOURCE_DIR="' + resourceDir + '"');
- defines.push('CLANG_BINDIR="' + libclang.llvmBinDir + '"');
- return defines;
- }
-
+ cpp.defines: base.concat("CLANGPCHMANAGER_LIB")
cpp.includePaths: ["."]
files: [
diff --git a/src/plugins/clangrefactoring/clangrefactoring.qbs b/src/plugins/clangrefactoring/clangrefactoring.qbs
index 803986423c..af92d01aec 100644
--- a/src/plugins/clangrefactoring/clangrefactoring.qbs
+++ b/src/plugins/clangrefactoring/clangrefactoring.qbs
@@ -5,6 +5,7 @@ QtcPlugin {
name: "ClangRefactoring"
Depends { name: "libclang"; required: false }
+ Depends { name: "clang_defines" }
condition: libclang.present && libclang.toolingEnabled
Depends { name: "ClangSupport" }
@@ -16,19 +17,7 @@ QtcPlugin {
Depends { name: "ProjectExplorer" }
Depends { name: "TextEditor" }
- cpp.defines: {
- var defines = base;
- defines.push("CLANGPCHMANAGER_LIB");
-
- // The following defines are used to determine the clang include path for intrinsics.
- defines.push('CLANG_VERSION="' + libclang.llvmVersion + '"');
- var resourceDir = FileInfo.joinPaths(libclang.llvmLibDir, "clang", libclang.llvmVersion,
- "include");
- defines.push('CLANG_RESOURCE_DIR="' + resourceDir + '"');
- defines.push('CLANG_BINDIR="' + libclang.llvmBinDir + '"');
- return defines;
- }
-
+ cpp.defines: base.concat("CLANGPCHMANAGER_LIB")
cpp.includePaths: ["."]
files: [
diff --git a/src/plugins/clangtools/clangtools.qbs b/src/plugins/clangtools/clangtools.qbs
index e0bab2c34c..97759e54c5 100644
--- a/src/plugins/clangtools/clangtools.qbs
+++ b/src/plugins/clangtools/clangtools.qbs
@@ -12,7 +12,9 @@ QtcPlugin {
Depends { name: "ProjectExplorer" }
Depends { name: "QtcSsh" }
Depends { name: "Utils" }
+
Depends { name: "libclang"; required: false }
+ Depends { name: "clang_defines" }
Depends { name: "Qt.widgets" }
@@ -23,24 +25,12 @@ QtcPlugin {
condition: libclang.present
+ cpp.defines: base.concat("CLANGPCHMANAGER_LIB")
cpp.includePaths: base.concat(libclang.llvmIncludeDir)
cpp.libraryPaths: base.concat(libclang.llvmLibDir)
cpp.dynamicLibraries: base.concat(libclang.llvmLibs)
cpp.rpaths: base.concat(libclang.llvmLibDir)
- cpp.defines: {
- var defines = base;
- defines.push("CLANGPCHMANAGER_LIB");
-
- // The following defines are used to determine the clang include path for intrinsics.
- defines.push('CLANG_VERSION="' + libclang.llvmVersion + '"');
- var resourceDir = FileInfo.joinPaths(libclang.llvmLibDir, "clang", libclang.llvmVersion,
- "include");
- defines.push('CLANG_RESOURCE_DIR="' + resourceDir + '"');
- defines.push('CLANG_BINDIR="' + libclang.llvmBinDir + '"');
- return defines;
- }
-
files: [
"clangfileinfo.h",
"clangfixitsrefactoringchanges.cpp",
diff --git a/src/plugins/projectexplorer/projectexplorer.qbs b/src/plugins/projectexplorer/projectexplorer.qbs
index 89534c13eb..67f07840ac 100644
--- a/src/plugins/projectexplorer/projectexplorer.qbs
+++ b/src/plugins/projectexplorer/projectexplorer.qbs
@@ -14,17 +14,9 @@ Project {
Depends { name: "Core" }
Depends { name: "TextEditor" }
Depends { name: "app_version_header" }
- Depends { name: "libclang"; required: false }
-
- Properties {
- condition: libclang.present
- cpp.defines: {
- var defines = base;
- defines.push('CLANG_BINDIR="' + libclang.llvmBinDir + '"');
- return defines;
- }
- }
+ Depends { name: "libclang"; required: false }
+ Depends { name: "clang_defines" }
Group {
name: "General"
View Lorry Controller Status