[Cmake-commits] [cmake-commits] king committed cmMakefile.cxx 1.525 1.526 cmTarget.cxx 1.276 1.277 cmTarget.h 1.145 1.146

[cmake-commits at cmake.org]

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

Modified Files:
	cmMakefile.cxx cmTarget.cxx cmTarget.h 
Log Message:
Create explicit cmTarget::FinishConfigure step

This method is called during ConfigureFinalPass on every target.  It
gives each target a chance to do some final processing after it is known
that no more commands will affect it.  Currently we just call the old
AnalyzeLibDependencies that used to be called directly.


Index: cmTarget.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmTarget.h,v
retrieving revision 1.145
retrieving revision 1.146
diff -C 2 -d -r1.145 -r1.146
*** cmTarget.h	5 Oct 2009 13:05:57 -0000	1.145
--- cmTarget.h	5 Oct 2009 13:06:29 -0000	1.146
***************
*** 220,224 ****
    std::set<cmStdString>const& GetUtilities() const { return this->Utilities; }
  
!   void AnalyzeLibDependencies( const cmMakefile& mf );
  
    ///! Set/Get a property of this target file
--- 220,225 ----
    std::set<cmStdString>const& GetUtilities() const { return this->Utilities; }
  
!   /** Finalize the target at the end of the Configure step.  */
!   void FinishConfigure();
  
    ///! Set/Get a property of this target file
***************
*** 490,493 ****
--- 491,496 ----
                             DependencyMap& dep_map);
  
+   void AnalyzeLibDependencies( const cmMakefile& mf );
+ 
    const char* GetSuffixVariableInternal(bool implib);
    const char* GetPrefixVariableInternal(bool implib);

Index: cmTarget.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmTarget.cxx,v
retrieving revision 1.276
retrieving revision 1.277
diff -C 2 -d -r1.276 -r1.277
*** cmTarget.cxx	5 Oct 2009 13:05:54 -0000	1.276
--- cmTarget.cxx	5 Oct 2009 13:06:29 -0000	1.277
***************
*** 1029,1032 ****
--- 1029,1039 ----
  
  //----------------------------------------------------------------------------
+ void cmTarget::FinishConfigure()
+ {
+   // Do old-style link dependency analysis.
+   this->AnalyzeLibDependencies(*this->Makefile);
+ }
+ 
+ //----------------------------------------------------------------------------
  cmListFileBacktrace const& cmTarget::GetBacktrace() const
  {

Index: cmMakefile.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.cxx,v
retrieving revision 1.525
retrieving revision 1.526
diff -C 2 -d -r1.525 -r1.526
*** cmMakefile.cxx	2 Oct 2009 17:52:12 -0000	1.525
--- cmMakefile.cxx	5 Oct 2009 13:06:27 -0000	1.526
***************
*** 811,815 ****
         l != this->Targets.end(); l++)
      {
!     l->second.AnalyzeLibDependencies(*this);
      }
  }
--- 811,815 ----
         l != this->Targets.end(); l++)
      {
!     l->second.FinishConfigure();
      }
  }