Browse Source

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.
Brad King 16 years ago
parent
commit
1db5c90644
2 changed files with 9 additions and 4 deletions
  1. 8 4
      Source/cmLocalGenerator.cxx
  2. 1 0
      Source/cmLocalGenerator.h

+ 8 - 4
Source/cmLocalGenerator.cxx

@@ -121,8 +121,15 @@ void cmLocalGenerator::Configure()
   // relative paths.
   // relative paths.
   this->UseRelativePaths = this->Makefile->IsOn("CMAKE_USE_RELATIVE_PATHS");
   this->UseRelativePaths = this->Makefile->IsOn("CMAKE_USE_RELATIVE_PATHS");
 
 
+  this->ComputeObjectMaxPath();
+
+  this->Configured = true;
+}
+
+//----------------------------------------------------------------------------
+void cmLocalGenerator::ComputeObjectMaxPath()
+{
   // Choose a maximum object file name length.
   // Choose a maximum object file name length.
-  {
 #if defined(_WIN32) || defined(__CYGWIN__)
 #if defined(_WIN32) || defined(__CYGWIN__)
   this->ObjectPathMax = 250;
   this->ObjectPathMax = 250;
 #else
 #else
@@ -157,9 +164,6 @@ void cmLocalGenerator::Configure()
       }
       }
     }
     }
   this->ObjectMaxPathViolations.clear();
   this->ObjectMaxPathViolations.clear();
-  }
-
-  this->Configured = true;
 }
 }
 
 
 void cmLocalGenerator::SetupPathConversions()
 void cmLocalGenerator::SetupPathConversions()

+ 1 - 0
Source/cmLocalGenerator.h

@@ -352,6 +352,7 @@ protected:
 
 
   std::string& CreateSafeUniqueObjectFileName(const char* sin,
   std::string& CreateSafeUniqueObjectFileName(const char* sin,
                                               std::string const& dir_max);
                                               std::string const& dir_max);
+  void ComputeObjectMaxPath();
 
 
   void ConfigureRelativePaths();
   void ConfigureRelativePaths();
   std::string FindRelativePathTopSource();
   std::string FindRelativePathTopSource();