added new command

Source/cmCommands.cxx

@@ -58,6 +58,7 @@
 #include "cmLinkDirectoriesCommand.cxx"
 #include "cmLinkLibrariesCommand.cxx"
 #include "cmLoadCacheCommand.cxx"
+#include "cmMacroCommand.cxx"
 #include "cmMakeDirectoryCommand.cxx"
 #include "cmMarkAsAdvancedCommand.cxx"
 #include "cmMessageCommand.cxx"
@@ -127,6 +128,7 @@ void GetPredefinedCommands(std::list<cmCommand*>& commands)
   commands.push_back(new cmLinkDirectoriesCommand);
   commands.push_back(new cmLinkLibrariesCommand);
   commands.push_back(new cmLoadCacheCommand);
+  commands.push_back(new cmMacroCommand);
   commands.push_back(new cmMakeDirectoryCommand);
   commands.push_back(new cmMarkAsAdvancedCommand);
   commands.push_back(new cmMessageCommand);

Source/cmMacroCommand.cxx

@@ -0,0 +1,128 @@
+/*=========================================================================
+
+  Program:   Insight Segmentation & Registration Toolkit
+  Module:    $RCSfile$
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+  Copyright (c) 2002 Insight Consortium. All rights reserved.
+  See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
+
+=========================================================================*/
+#include "cmMacroCommand.h"
+#include "cmCacheManager.h"
+
+bool cmMacroFunctionBlocker::
+IsFunctionBlocked(const char *name, const std::vector<std::string> &args, 
+                  cmMakefile &mf) 
+{
+  // record commands until we hit the ENDMACRO
+  // at the ENDMACRO call we shift gears and start looking for invocations
+  if (!strcmp(name,"ENDMACRO") && args[0] == m_Args[0])
+    {
+    m_Executing = true;
+    return true;
+    }
+  
+  if (!m_Executing)
+    {
+    // if it wasn't an endmacro and we are not executing then we must be
+    // recording
+    m_Commands.push_back(name);
+    std::vector<std::string> newArgs;
+    for(std::vector<std::string>::const_iterator j = args.begin();
+        j != args.end(); ++j)
+      {   
+      newArgs.push_back(*j);
+      }
+    m_CommandArguments.push_back(newArgs);
+    return true;
+    }
+  
+  // otherwise the macro has been recorded and we are executing
+  // so we look for macro invocations
+  if (!strcmp(name,m_Args[0].c_str()))
+    {
+    // make sure the number of arguments matches
+    if (args.size() != m_Args.size() - 1)
+      {
+      cmSystemTools::Error("A macro was invoked without the correct number of arguments. The macro name was: ", m_Args[0].c_str());
+      }
+    // for each recorded command
+    for(unsigned int c = 0; c < m_Commands.size(); ++c)
+      {
+      // perform argument replacement
+      std::vector<std::string> newArgs;
+      // for each argument of this command
+      for (std::vector<std::string>::const_iterator k = 
+             m_CommandArguments[c].begin();
+           k != m_CommandArguments[c].end(); ++k)
+        {
+        // replace any matches with the formal arguments
+        std::string tmps = *k;
+        // for each formal macro argument
+        for (unsigned int j = 1; j < m_Args.size(); ++j)
+          {
+          std::string variable = "${";
+          variable += m_Args[j];
+          variable += "}"; 
+          cmSystemTools::ReplaceString(tmps, variable.c_str(),
+                                       args[j-1].c_str());
+          }
+        newArgs.push_back(tmps);
+        }
+      // execute command
+      mf.ExecuteCommand(m_Commands[c],newArgs);
+      }
+    return true;
+    }
+
+  // if not an invocation then it is just an ordinary line
+  return false;
+}
+
+bool cmMacroFunctionBlocker::
+ShouldRemove(const char *name, const std::vector<std::string> &args, 
+             cmMakefile &) 
+{
+  if (!strcmp(name,"ENDFOREACH") && args[0] == m_Args[0])
+    {
+    return true;
+    }
+  return false;
+}
+
+void cmMacroFunctionBlocker::
+ScopeEnded(cmMakefile &) 
+{
+  // macros never leave scope
+}
+
+bool cmMacroCommand::InitialPass(std::vector<std::string> const& argsIn)
+{
+  std::vector<std::string> args;
+  cmSystemTools::ExpandListArguments(argsIn, args);
+
+  if(args.size() < 1)
+    {
+    this->SetError("called with incorrect number of arguments");
+    return false;
+    }
+  
+  // create a function blocker
+  cmMacroFunctionBlocker *f = new cmMacroFunctionBlocker();
+  for(std::vector<std::string>::const_iterator j = args.begin();
+      j != args.end(); ++j)
+    {   
+    f->m_Args.push_back(*j);
+    }
+  m_Makefile->AddFunctionBlocker(f);
+  
+  return true;
+}
+

Source/cmMacroCommand.h

@@ -0,0 +1,104 @@
+/*=========================================================================
+
+  Program:   Insight Segmentation & Registration Toolkit
+  Module:    $RCSfile$
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+  Copyright (c) 2002 Insight Consortium. All rights reserved.
+  See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
+
+=========================================================================*/
+#ifndef cmMacroCommand_h
+#define cmMacroCommand_h
+
+#include "cmStandardIncludes.h"
+#include "cmCommand.h"
+#include "cmFunctionBlocker.h"
+
+/** \class cmMacroFunctionBlocker
+ * \brief subclass of function blocker
+ *
+ * 
+ */
+class cmMacroFunctionBlocker : public cmFunctionBlocker
+{
+public:
+  cmMacroFunctionBlocker() {m_Executing = false;}
+  virtual ~cmMacroFunctionBlocker() {}
+  virtual bool IsFunctionBlocked(const char *name, 
+                                 const std::vector<std::string> &args, 
+                                 cmMakefile &mf);
+  virtual bool ShouldRemove(const char *name, 
+                            const std::vector<std::string> &args, 
+                            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;
+  bool m_Executing;
+};
+
+/** \class cmMacroCommand
+ * \brief starts an if block
+ *
+ * cmMacroCommand starts an if block
+ */
+class cmMacroCommand : public cmCommand
+{
+public:
+  /**
+   * This is a virtual constructor for the command.
+   */
+  virtual cmCommand* Clone() 
+    {
+    return new cmMacroCommand;
+    }
+
+  /**
+   * This is called when the command is first encountered in
+   * the CMakeLists.txt file.
+   */
+  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;}
+
+  /**
+   * The name of the command as specified in CMakeList.txt.
+   */
+  virtual const char* GetName() { return "MACRO";}
+
+  /**
+   * Succinct documentation.
+   */
+  virtual const char* GetTerseDocumentation() 
+    {
+    return "start defining a Macro.";
+    }
+  
+  /**
+   * More documentation.
+   */
+  virtual const char* GetFullDocumentation()
+    {
+    return
+      "MACRO(name arg1 arg2 arg3 ...) Starts to define a macro named name that takes arguments named arg1 arg2 arg3...  When the macro is invoked the actual arguments passed replace the formal arguments. ";
+    }
+  
+  cmTypeMacro(cmMacroCommand, cmCommand);
+};
+
+
+#endif