Commit 1db5c906 authored by Brad King's avatar Brad King
Browse files

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.
parent a6890a16
...@@ -121,8 +121,15 @@ void cmLocalGenerator::Configure() ...@@ -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() ...@@ -157,9 +164,6 @@ void cmLocalGenerator::Configure()
} }
} }
this->ObjectMaxPathViolations.clear(); this->ObjectMaxPathViolations.clear();
}
this->Configured = true;
} }
void cmLocalGenerator::SetupPathConversions() void cmLocalGenerator::SetupPathConversions()
......
...@@ -352,6 +352,7 @@ protected: ...@@ -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();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment