ENH: Change to new CABLE command architecture. CABLE configuration code is now generated on the first pass, during the Invoke() calls.

1 files changed, 7 insertions, 35 deletions

diff --git a/Source/cmCableInstantiateCommand.h b/Source/cmCableInstantiateCommand.h
index d61eb77..4f8f2bd 100644
--- a/Source/cmCableInstantiateCommand.h
+++ b/Source/cmCableInstantiateCommand.h
@@ -17,7 +17,7 @@
 #define cmCableInstantiateCommand_h
 
 #include "cmStandardIncludes.h"
-#include "cmCableCommand.h"
+#include "cmCablePackageEntryCommand.h"
 
 /** \class cmCableInstantiateCommand
  * \brief Define a command that generates a rule for explicit template
@@ -26,7 +26,7 @@
  * cmCableInstantiateCommand is used to generate a rule in a CABLE
  * configuration file to create explicit template instantiations.
  */
-class cmCableInstantiateCommand : public cmCableCommand
+class cmCableInstantiateCommand : public cmCablePackageEntryCommand
 {
 public:
   /**
@@ -38,24 +38,6 @@ public:
     }
 
   /**
-   * This is called when the command is first encountered in
-   * the CMakeLists.txt file.
-   */
-  virtual bool Invoke(std::vector<std::string>& args);
-  
-  /**
-   * This is called after all input commands have been processed.
-   */
-  virtual void FinalPass();
-
-  /**
-   * 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 "CABLE_INSTANTIATE";}
@@ -65,7 +47,7 @@ public:
    */
   virtual const char* GetTerseDocumentation() 
     {
-    return "Define CABLE InstantiationSet.";
+    return "Define CABLE InstantiationSet in a package.";
     }
   
   /**
@@ -74,27 +56,17 @@ public:
   virtual const char* GetFullDocumentation()
     {
     return
-      "CABLE_INSTANTIATE(cable_config_file member1 member2 ...)\n"
+      "CABLE_INSTANTIATE(member1 member2 ...)\n"
       "Generates an InstantiationSet in the CABLE configuration.  It is\n"
       "assumed that all members of the set are explicit instantiations of\n"
       "template non-classes (functions, operators, etc).";
     }
 
-  virtual void WriteConfiguration(std::ostream&) const;  
+  virtual void WriteConfiguration() const;  
 
-  cmTypeMacro(cmCableInstantiateCommand, cmCableCommand);
+  cmTypeMacro(cmCableInstantiateCommand, cmCablePackageCommand);
 protected:
-  typedef std::vector<std::string>  Elements;
-  
-  /**
-   * The output file to which to write the configuration.
-   */
-  cmCableData::OutputFile* m_OutputFile;
-
-  /**
-   * The elements describing the set of instantiations.
-   */
-  Elements m_Elements;
+  typedef cmCablePackageEntryCommand::Entries  Entries;
 };