FIX: foreach function-blockers were using expanded args. Add virtual func to specify if function blocker needs them expanded or not.

1 files changed, 12 insertions, 2 deletions

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 6dd3caf..aa2b80b 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -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;
+        }
       }
     }