[Cmake-commits] [cmake-commits] king committed cmCommand.h 1.28 1.29 cmConfigureFileCommand.h 1.23 1.24 cmExportLibraryDependencies.h 1.10 1.11 cmFLTKWrapUICommand.h 1.16 1.17 cmInstallFilesCommand.h 1.23 1.24 cmInstallProgramsCommand.h 1.20 1.21 cmLoadCommandCommand.cxx 1.29 1.30 cmMakefile.cxx 1.514 1.515

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv8983/Source

Modified Files:
	cmCommand.h cmConfigureFileCommand.h 
	cmExportLibraryDependencies.h cmFLTKWrapUICommand.h 
	cmInstallFilesCommand.h cmInstallProgramsCommand.h 
	cmLoadCommandCommand.cxx cmMakefile.cxx 
Log Message:
ENH: Keep only FinalPass commands in memory

In cmMakefile we save all invoked commands so that FinalPass can be
called on them later.  Most commands have no final pass, so we should
keep only the few that do.


Index: cmInstallProgramsCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallProgramsCommand.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C 2 -d -r1.20 -r1.21
*** cmInstallProgramsCommand.h	23 Jan 2008 15:27:59 -0000	1.20
--- cmInstallProgramsCommand.h	24 Jul 2009 17:31:34 -0000	1.21
***************
*** 65,68 ****
--- 65,70 ----
    virtual void FinalPass();
  
+   virtual bool HasFinalPass() const { return true; }
+ 
    /**
     * More documentation.

Index: cmConfigureFileCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmConfigureFileCommand.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -C 2 -d -r1.23 -r1.24
*** cmConfigureFileCommand.h	28 Jun 2009 12:06:52 -0000	1.23
--- cmConfigureFileCommand.h	24 Jul 2009 17:31:34 -0000	1.24
***************
*** 82,85 ****
--- 82,86 ----
  
    virtual void FinalPass();
+   virtual bool HasFinalPass() const { return !this->Immediate; }
  private:
    int ConfigureFile();

Index: cmLoadCommandCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLoadCommandCommand.cxx,v
retrieving revision 1.29
retrieving revision 1.30
diff -C 2 -d -r1.29 -r1.30
*** cmLoadCommandCommand.cxx	23 Jan 2008 15:27:59 -0000	1.29
--- cmLoadCommandCommand.cxx	24 Jul 2009 17:31:34 -0000	1.30
***************
*** 69,72 ****
--- 69,74 ----
     */
    virtual void FinalPass();
+   virtual bool HasFinalPass() const
+     { return this->info.FinalPass? true:false; }
  
    /**

Index: cmInstallFilesCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallFilesCommand.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -C 2 -d -r1.23 -r1.24
*** cmInstallFilesCommand.h	23 Jan 2008 15:27:59 -0000	1.23
--- cmInstallFilesCommand.h	24 Jul 2009 17:31:34 -0000	1.24
***************
*** 64,67 ****
--- 64,68 ----
     */
    virtual void FinalPass();
+   virtual bool HasFinalPass() const { return !this->IsFilesForm; }
  
    /**

Index: cmCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCommand.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -C 2 -d -r1.28 -r1.29
*** cmCommand.h	24 Sep 2008 12:51:33 -0000	1.28
--- cmCommand.h	24 Jul 2009 17:31:33 -0000	1.29
***************
*** 88,91 ****
--- 88,96 ----
     */
    virtual void FinalPass() {};
+ 
+   /**
+    * Does this command have a final pass?  Query after InitialPass.
+    */
+   virtual bool HasFinalPass() const { return false; }
    
    /**

Index: cmExportLibraryDependencies.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmExportLibraryDependencies.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C 2 -d -r1.10 -r1.11
*** cmExportLibraryDependencies.h	20 Feb 2008 18:36:38 -0000	1.10
--- cmExportLibraryDependencies.h	24 Jul 2009 17:31:34 -0000	1.11
***************
*** 49,52 ****
--- 49,53 ----
     */
    virtual void FinalPass();
+   virtual bool HasFinalPass() const { return true; }
  
    /**

Index: cmFLTKWrapUICommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmFLTKWrapUICommand.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C 2 -d -r1.16 -r1.17
*** cmFLTKWrapUICommand.h	23 Jan 2008 15:27:59 -0000	1.16
--- cmFLTKWrapUICommand.h	24 Jul 2009 17:31:34 -0000	1.17
***************
*** 53,56 ****
--- 53,57 ----
     */
    virtual void FinalPass();
+   virtual bool HasFinalPass() const { return true; }
  
    /**

Index: cmMakefile.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.cxx,v
retrieving revision 1.514
retrieving revision 1.515
diff -C 2 -d -r1.514 -r1.515
*** cmMakefile.cxx	22 Jul 2009 18:22:45 -0000	1.514
--- cmMakefile.cxx	24 Jul 2009 17:31:34 -0000	1.515
***************
*** 416,420 ****
            }
          }
!       else
          {
          // use the command
--- 416,420 ----
            }
          }
!       else if(pcmd->HasFinalPass())
          {
          // use the command