Commit 437a8c98 authored by Sebastien Barre's avatar Sebastien Barre
Browse files

FIX: foreach function-blockers were using expanded args. Add virtual func to...

FIX: foreach function-blockers were using expanded args. Add virtual func to specify if function blocker needs them expanded or not.
parent ccbdc30a
......@@ -39,6 +39,8 @@ public:
cmMakefile &mf);
virtual void ScopeEnded(cmMakefile &mf);
virtual int NeedExpandedVariables () { return 0; };
std::vector<std::string> m_Args;
std::vector<std::string> m_Commands;
std::vector<std::vector<std::string> > m_CommandArguments;
......
......@@ -50,6 +50,8 @@ public:
virtual void ScopeEnded(cmMakefile &mf) {}
virtual ~cmFunctionBlocker() {}
virtual int NeedExpandedVariables () { return 1; };
};
#endif
......@@ -1187,9 +1187,19 @@ bool cmMakefile::IsFunctionBlocked(const char *name,
for (pos = m_FunctionBlockers.begin();
pos != m_FunctionBlockers.end(); ++pos)
{
if ((*pos)->IsFunctionBlocked(name, expandedArguments, *this))
if ((*pos)->NeedExpandedVariables())
{
return true;
if ((*pos)->IsFunctionBlocked(name, expandedArguments, *this))
{
return true;
}
}
else
{
if ((*pos)->IsFunctionBlocked(name, args, *this))
{
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