summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@qt.io>2016-11-15 17:32:03 +0100
committerTobias Hunger <tobias.hunger@qt.io>2016-11-15 16:33:35 +0000
commitc49a0dd50203c436d9ed8fdbf31bef4a1f2ddb8b (patch)
tree9fe41ddfbaa64555da2fcea8258b221baccbfefd
parenteff07681009e9e971966e02fb5418b96f7455cc3 (diff)
downloadqt-creator-c49a0dd50203c436d9ed8fdbf31bef4a1f2ddb8b.tar.gz
CMake: Fix generator warning for server-mode cmake tools
Do not warn on wrong extra generators if cmake supports server-mode. Make the massage point out the missing server-mode while at it. Change-Id: I643c77fbebe4ba9a7ea6fee28422283118d145dd Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
-rw-r--r--src/plugins/cmakeprojectmanager/cmakekitinformation.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
index d38155c345..f7606c41bc 100644
--- a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
@@ -366,9 +366,10 @@ QList<Task> CMakeGeneratorKitInformation::validate(const Kit *k) const
Utils::FileName(), -1, Core::Id(Constants::TASK_CATEGORY_BUILDSYSTEM));
}
}
- if (info.extraGenerator != "CodeBlocks") {
- result << Task(Task::Warning, tr("CMake generator does not generate a CodeBlocks file. "
- "Qt Creator will not be able to parse the CMake project."),
+ if (!tool->hasServerMode() && info.extraGenerator != "CodeBlocks") {
+ result << Task(Task::Warning, tr("The selected CMake binary has no server-mode and the CMake "
+ "generator does not generate a CodeBlocks file. "
+ "Qt Creator will not be able to parse CMake projects."),
Utils::FileName(), -1, Core::Id(Constants::TASK_CATEGORY_BUILDSYSTEM));
}
}