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

Clang: Fix build with LibTooling

Browse Source 
Do not build plugins when the tools part is not built.

Change-Id: I3325707fe6446364f07a9ad5e5e039fc9fb6437d
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
Ivan Donchevskii
2018-09-13 14:18:27 +02:00
parent 2c4dadccb6
commit 5b454c95fc
3 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/clangpchmanager/clangpchmanager.pro
View File

@@ -5,6 +5,11 @@ include(../../shared/clang/clang_defines.pri)
requires(!isEmpty(LIBTOOLING_LIBS)) requires(!isEmpty(LIBTOOLING_LIBS))
win32 {
LLVM_BUILDMODE = $$system($$llvm_config --build-mode, lines)
CONFIG(debug, debug|release):requires(equals(LLVM_BUILDMODE, "Debug"))
}
HEADERS += \ HEADERS += \
$$PWD/clangpchmanagerplugin.h \ $$PWD/clangpchmanagerplugin.h \
qtcreatorprojectupdater.h qtcreatorprojectupdater.h

2
src/plugins/clangpchmanager/projectupdater.cpp
View File

@@ -171,7 +171,7 @@ Utils::SmallStringVector ProjectUpdater::createIncludeSearchPaths(
Utils::SmallStringVector includePaths; Utils::SmallStringVector includePaths;
for (const ProjectExplorer::HeaderPath &projectPartHeaderPath : projectPartHeaderPaths) { for (const ProjectExplorer::HeaderPath &projectPartHeaderPath : projectPartHeaderPaths) {
if (projectPartHeaderPath.isValid()) if (!projectPartHeaderPath.path.isEmpty())
includePaths.emplace_back(projectPartHeaderPath.path); includePaths.emplace_back(projectPartHeaderPath.path);
} }

5
src/plugins/clangrefactoring/clangrefactoring.pro
View File

@@ -6,6 +6,11 @@ include(../../shared/clang/clang_defines.pri)
requires(!isEmpty(LIBTOOLING_LIBS)) requires(!isEmpty(LIBTOOLING_LIBS))
win32 {
LLVM_BUILDMODE = $$system($$llvm_config --build-mode, lines)
CONFIG(debug, debug|release):requires(equals(LLVM_BUILDMODE, "Debug"))
}
HEADERS += \ HEADERS += \
clangrefactoringplugin.h \ clangrefactoringplugin.h \
baseclangquerytexteditorwidget.h \ baseclangquerytexteditorwidget.h \