ENH: fix a warning and a nice fix to the IF command

1 files changed, 18 insertions, 4 deletions

diff --git a/Source/cmIfCommand.cxx b/Source/cmIfCommand.cxx
index 265c0d6..e28956f 100644
--- a/Source/cmIfCommand.cxx
+++ b/Source/cmIfCommand.cxx
@@ -22,12 +22,26 @@
 bool cmIfFunctionBlocker::
 IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile &mf)
 {
-  // always let if statements through
-  if (!cmSystemTools::Strucmp(lff.Name.c_str(),"if"))
+  // if we are blocking then all we need to do is keep track of 
+  // scope depth of nested if statements
+  if (this->IsBlocking)
     {
-    return false;
+    if (!cmSystemTools::Strucmp(lff.Name.c_str(),"if"))
+      {
+      this->ScopeDepth++;
+      return true;
+      }
     }
-  
+
+  if (this->IsBlocking && this->ScopeDepth)
+    {
+    if (!cmSystemTools::Strucmp(lff.Name.c_str(),"endif"))
+      {
+      this->ScopeDepth--;
+      }
+    return true;
+    }
+      
   // watch for our ELSE or ENDIF
   if (!cmSystemTools::Strucmp(lff.Name.c_str(),"else") ||
       !cmSystemTools::Strucmp(lff.Name.c_str(),"elseif") ||