diff options
| author | Ivan Donchevskii <ivan.donchevskii@qt.io> | 2018-09-13 14:18:27 +0200 |
|---|---|---|
| committer | Ivan Donchevskii <ivan.donchevskii@qt.io> | 2018-09-13 13:25:36 +0000 |
| commit | 5b454c95fc2fc3f107280b59e5bf26d9038a65c2 (patch) | |
| tree | af2fda7d029f9be32d8c0f711a939bd8221f8aae /src/plugins/clangpchmanager | |
| parent | 2c4dadccb623147a14b498a02290e6275d4d0bc2 (diff) | |
Clang: Fix build with LibTooling
Do not build plugins when the tools part is not built.
Change-Id: I3325707fe6446364f07a9ad5e5e039fc9fb6437d
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Diffstat (limited to 'src/plugins/clangpchmanager')
| -rw-r--r-- | src/plugins/clangpchmanager/clangpchmanager.pro | 5 | ||||
| -rw-r--r-- | src/plugins/clangpchmanager/projectupdater.cpp | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/plugins/clangpchmanager/clangpchmanager.pro b/src/plugins/clangpchmanager/clangpchmanager.pro index a61103d839..204f740a28 100644 --- a/src/plugins/clangpchmanager/clangpchmanager.pro +++ b/src/plugins/clangpchmanager/clangpchmanager.pro @@ -5,6 +5,11 @@ include(../../shared/clang/clang_defines.pri) requires(!isEmpty(LIBTOOLING_LIBS)) +win32 { + LLVM_BUILDMODE = $$system($$llvm_config --build-mode, lines) + CONFIG(debug, debug|release):requires(equals(LLVM_BUILDMODE, "Debug")) +} + HEADERS += \ $$PWD/clangpchmanagerplugin.h \ qtcreatorprojectupdater.h diff --git a/src/plugins/clangpchmanager/projectupdater.cpp b/src/plugins/clangpchmanager/projectupdater.cpp index a36689b3b7..81d140d3f7 100644 --- a/src/plugins/clangpchmanager/projectupdater.cpp +++ b/src/plugins/clangpchmanager/projectupdater.cpp @@ -171,7 +171,7 @@ Utils::SmallStringVector ProjectUpdater::createIncludeSearchPaths( Utils::SmallStringVector includePaths; for (const ProjectExplorer::HeaderPath &projectPartHeaderPath : projectPartHeaderPaths) { - if (projectPartHeaderPath.isValid()) + if (!projectPartHeaderPath.path.isEmpty()) includePaths.emplace_back(projectPartHeaderPath.path); } |