[Cmake-commits] [cmake-commits] king committed cmLocalGenerator.cxx 1.307 1.308 cmLocalGenerator.h 1.115 1.116

[cmake-commits at cmake.org]

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

Modified Files:
	cmLocalGenerator.cxx cmLocalGenerator.h 
Log Message:
Factor cmLocalGenerator::Configure input file read

This method tells the cmMakefile to read the input CMakeLists.txt file.
We factor out the call into a ReadInputFile method so it can be extended
without polluting the Configure method.


Index: cmLocalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.cxx,v
retrieving revision 1.307
retrieving revision 1.308
diff -C 2 -d -r1.307 -r1.308
*** cmLocalGenerator.cxx	3 Sep 2009 12:26:46 -0000	1.307
--- cmLocalGenerator.cxx	3 Sep 2009 12:26:59 -0000	1.308
***************
*** 100,106 ****
    
    // find & read the list file
!   std::string currentStart = this->Makefile->GetStartDirectory();
!   currentStart += "/CMakeLists.txt";
!   this->Makefile->ReadListFile(currentStart.c_str());
  
    // at the end of the ReadListFile handle any old style subdirs
--- 100,104 ----
    
    // find & read the list file
!   this->ReadInputFile();
  
    // at the end of the ReadListFile handle any old style subdirs
***************
*** 167,170 ****
--- 165,176 ----
  }
  
+ //----------------------------------------------------------------------------
+ void cmLocalGenerator::ReadInputFile()
+ {
+   std::string currentStart = this->Makefile->GetStartDirectory();
+   currentStart += "/CMakeLists.txt";
+   this->Makefile->ReadListFile(currentStart.c_str());
+ }
+ 
  void cmLocalGenerator::SetupPathConversions()
  {  

Index: cmLocalGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.h,v
retrieving revision 1.115
retrieving revision 1.116
diff -C 2 -d -r1.115 -r1.116
*** cmLocalGenerator.h	3 Sep 2009 12:26:46 -0000	1.115
--- cmLocalGenerator.h	3 Sep 2009 12:27:00 -0000	1.116
***************
*** 366,369 ****
--- 366,372 ----
    virtual bool CheckDefinition(std::string const& define) const;
  
+   /** Read the input CMakeLists.txt file.  */
+   void ReadInputFile();
+ 
    cmMakefile *Makefile;
    cmGlobalGenerator *GlobalGenerator;