ENH: big change that includes immediate subdir support, removing the notion of inherited commands, makefiles no longer read in the parent makefiles but instead inherit thier parent makefiles current settings

1 files changed, 1 insertions, 8 deletions

diff --git a/Source/cmMacroCommand.h b/Source/cmMacroCommand.h
index b0848d1..26d0f85 100644
--- a/Source/cmMacroCommand.h
+++ b/Source/cmMacroCommand.h
@@ -28,7 +28,7 @@
 class cmMacroFunctionBlocker : public cmFunctionBlocker
 {
 public:
-  cmMacroFunctionBlocker() {m_Executing = false;}
+  cmMacroFunctionBlocker() {}
   virtual ~cmMacroFunctionBlocker() {}
   virtual bool IsFunctionBlocked(const cmListFileFunction&, cmMakefile &mf);
   virtual bool ShouldRemove(const cmListFileFunction&, cmMakefile &mf);
@@ -36,7 +36,6 @@ public:
   
   std::vector<std::string> m_Args;
   std::vector<cmListFileFunction> m_Functions;
-  bool m_Executing;
 };
 
 /** \class cmMacroCommand
@@ -62,12 +61,6 @@ public:
   virtual bool InitialPass(std::vector<std::string> const& args);
 
   /**
-   * This determines if the command gets propagated down
-   * to makefiles located in subdirectories.
-   */
-  virtual bool IsInherited() {return true;}
-
-  /**
    * This determines if the command is invoked when in script mode.
    */
   virtual bool IsScriptable() { return true; }