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

CMake: MakeStep consistently check that we have a buildconfiguration

Browse Source 
Technically the user can only get into a no buildconfiguration state
with broken settings. But we should either check everywhere or nowhere.

Change-Id: Ibdc831b66e6cf141c8d25bafed7e568e3cff2ab1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Daniel Teske
2014-04-03 16:29:37 +02:00
parent d24e509662
commit d5f2dc0df4
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/cmakeprojectmanager/makestep.cpp
View File

@@ -180,13 +180,22 @@ bool MakeStep::init()
{
CMakeBuildConfiguration *bc = cmakeBuildConfiguration();
if (!bc)
bc = static_cast<CMakeBuildConfiguration *>(target()->activeBuildConfiguration());
bc = targetsActiveBuildConfiguration();
if (!bc) {
emit addTask(Task(Task::Error, tr("Qt Creator needs a build configuration set up to build. Configure a build configuration in the project settings."),
Utils::FileName(), -1,
ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM));
}
ToolChain *tc = ToolChainKitInformation::toolChain(target()->kit());
if (!tc) {
emit addTask(Task(Task::Error, tr("Qt Creator needs a compiler set up to build. Configure a compiler in the kit options."),
Utils::FileName(), -1,
ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM));
}
if (!bc || !tc) {
emit addOutput(tr("Configuration is faulty. Check the Issues view for details."), BuildStep::MessageOutput);
return false;
}