From 1db5c90644c2567af5d10b66d7be6f39441ce8ff Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 3 Sep 2009 08:26:46 -0400 Subject: 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. --- Source/cmLocalGenerator.cxx | 12 ++++++++---- Source/cmLocalGenerator.h | 1 + 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index c051e0b..2546458 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -121,8 +121,15 @@ void cmLocalGenerator::Configure() // 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. - { #if defined(_WIN32) || defined(__CYGWIN__) this->ObjectPathMax = 250; #else @@ -157,9 +164,6 @@ void cmLocalGenerator::Configure() } } this->ObjectMaxPathViolations.clear(); - } - - this->Configured = true; } void cmLocalGenerator::SetupPathConversions() diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h index 94cf510..de17c86 100644 --- a/Source/cmLocalGenerator.h +++ b/Source/cmLocalGenerator.h @@ -352,6 +352,7 @@ protected: std::string& CreateSafeUniqueObjectFileName(const char* sin, std::string const& dir_max); + void ComputeObjectMaxPath(); void ConfigureRelativePaths(); std::string FindRelativePathTopSource(); -- cgit v0.12