forked from qt-creator/qt-creator
Warn if kit has no tool chain set up
Change-Id: I551402c1e3023feeeb127f001a0e908938a07fc2 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
@@ -168,14 +168,23 @@ void MakeStep::setClean(bool clean)
|
||||
bool MakeStep::init()
|
||||
{
|
||||
AutotoolsBuildConfiguration *bc = autotoolsBuildConfiguration();
|
||||
if (!bc)
|
||||
bc = static_cast<AutotoolsBuildConfiguration *>(target()->activeBuildConfiguration());
|
||||
|
||||
m_tasks.clear();
|
||||
ToolChain *tc = ToolChainKitInformation::toolChain(target()->kit());
|
||||
if (!tc) {
|
||||
m_tasks.append(Task(Task::Error, tr("Qt Creator needs a compiler set up to build. Configure a compiler in the kit options."),
|
||||
Utils::FileName(), -1,
|
||||
Core::Id(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM)));
|
||||
return true; // otherwise the tasks will not get reported
|
||||
}
|
||||
|
||||
QString arguments = Utils::QtcProcess::joinArgs(m_buildTargets);
|
||||
Utils::QtcProcess::addArgs(&arguments, additionalArguments());
|
||||
|
||||
setIgnoreReturnValue(m_clean);
|
||||
|
||||
ToolChain *tc = ProjectExplorer::ToolChainKitInformation::toolChain(target()->kit());
|
||||
|
||||
ProcessParameters *pp = processParameters();
|
||||
pp->setMacroExpander(bc->macroExpander());
|
||||
pp->setEnvironment(bc->environment());
|
||||
@@ -193,6 +202,18 @@ bool MakeStep::init()
|
||||
|
||||
void MakeStep::run(QFutureInterface<bool> &interface)
|
||||
{
|
||||
// Warn on common error conditions:
|
||||
bool canContinue = true;
|
||||
foreach (const Task &t, m_tasks) {
|
||||
addTask(t);
|
||||
canContinue = false;
|
||||
}
|
||||
if (!canContinue) {
|
||||
emit addOutput(tr("Configuration is faulty. Check the Issues view for details."), BuildStep::MessageOutput);
|
||||
interface.reportResult(false);
|
||||
return;
|
||||
}
|
||||
|
||||
AbstractProcessStep::run(interface);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user