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

CMake: Do not warn if there is no cmake but a generator is selected

Browse Source 
Task-number: QTCREATORBUG-16103
Change-Id: I4fcefd8ab68b6e34ca92e0d0c6fc1a8e6ec6b70c
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2016-04-19 11:57:09 +02:00
parent 769abc8509
commit 73123779aa
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
View File

@@ -217,12 +217,7 @@ QList<Task> CMakeGeneratorKitInformation::validate(const Kit *k) const
QString generator = CMakeGeneratorKitInformation::generator(k); QString generator = CMakeGeneratorKitInformation::generator(k);
QList<Task> result; QList<Task> result;
if (!tool) { if (tool) {
if (!generator.isEmpty()) {
result << Task(Task::Warning, tr("No CMake Tool configured, CMake generator will be ignored."),
Utils::FileName(), -1, Core::Id(Constants::TASK_CATEGORY_BUILDSYSTEM));
}
} else {
if (!tool->isValid()) { if (!tool->isValid()) {
result << Task(Task::Warning, tr("CMake Tool is unconfigured, CMake generator will be ignored."), result << Task(Task::Warning, tr("CMake Tool is unconfigured, CMake generator will be ignored."),
Utils::FileName(), -1, Core::Id(Constants::TASK_CATEGORY_BUILDSYSTEM)); Utils::FileName(), -1, Core::Id(Constants::TASK_CATEGORY_BUILDSYSTEM));