[Cmake-commits] [cmake-commits] king committed cmLocalGenerator.cxx 1.306 1.307 cmLocalGenerator.h 1.114 1.115

[cmake-commits at cmake.org]

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

Modified Files:
	cmLocalGenerator.cxx cmLocalGenerator.h 
Log Message:
Factor cmLocalGenerator::Configure object max path

Much of the code in this method was dedicated to computing ObjectMaxPath
after configuring the directory.  We move this last step into its own
ComputeObjectMaxPath method for better organization.


Index: cmLocalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.cxx,v
retrieving revision 1.306
retrieving revision 1.307
diff -C 2 -d -r1.306 -r1.307
*** cmLocalGenerator.cxx	3 Sep 2009 12:26:31 -0000	1.306
--- cmLocalGenerator.cxx	3 Sep 2009 12:26:46 -0000	1.307
***************
*** 122,127 ****
    this->UseRelativePaths = this->Makefile->IsOn("CMAKE_USE_RELATIVE_PATHS");
  
    // Choose a maximum object file name length.
-   {
  #if defined(_WIN32) || defined(__CYGWIN__)
    this->ObjectPathMax = 250;
--- 122,134 ----
    this->UseRelativePaths = this->Makefile->IsOn("CMAKE_USE_RELATIVE_PATHS");
  
+   this->ComputeObjectMaxPath();
+ 
+   this->Configured = true;
+ }
+ 
+ //----------------------------------------------------------------------------
+ void cmLocalGenerator::ComputeObjectMaxPath()
+ {
    // Choose a maximum object file name length.
  #if defined(_WIN32) || defined(__CYGWIN__)
    this->ObjectPathMax = 250;
***************
*** 158,164 ****
      }
    this->ObjectMaxPathViolations.clear();
-   }
- 
-   this->Configured = true;
  }
  
--- 165,168 ----

Index: cmLocalGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.h,v
retrieving revision 1.114
retrieving revision 1.115
diff -C 2 -d -r1.114 -r1.115
*** cmLocalGenerator.h	11 Jul 2009 04:05:20 -0000	1.114
--- cmLocalGenerator.h	3 Sep 2009 12:26:46 -0000	1.115
***************
*** 353,356 ****
--- 353,357 ----
    std::string& CreateSafeUniqueObjectFileName(const char* sin,
                                                std::string const& dir_max);
+   void ComputeObjectMaxPath();
  
    void ConfigureRelativePaths();