Commit 79fcc81b authored by Ken Martin's avatar Ken Martin
Browse files

better error checking for FOREACH

parent 0b2bdfa2
......@@ -18,18 +18,7 @@
bool cmEndForEachCommand::InvokeInitialPass(std::vector<cmListFileArgument> const& args)
{
if(args.size() < 1 )
{
this->SetError("called with incorrect number of arguments");
return false;
}
// remove any function blockers for this define
cmListFileFunction lff;
lff.m_Name = "ENDFOREACH";
lff.m_Arguments = args;
m_Makefile->RemoveFunctionBlocker(lff);
return true;
this->SetError("An ENDFOREACH command was found outside of a proper FOREACH ENDFOREACH structure. Or its arguments did not match the opening FOREACH command.");
return false;
}
......@@ -63,7 +63,8 @@ IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile &mf)
mf.ExecuteCommand(newLFF);
}
}
return false;
mf.RemoveFunctionBlocker(lff);
return true;
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment