kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmLocalGenerator: ComputeObjectMaxPath just before generating.

This commit is contained in:
Stephen Kelly 2015-05-30 19:34:09 +02:00 committed by Brad King
parent 27e11c6fea
commit 0863797037
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/cmGlobalGenerator.cxx
View File

@ -1223,6 +1223,7 @@ void cmGlobalGenerator::Generate()
this->CreateDefaultGlobalTargets(&globalTargets); this->CreateDefaultGlobalTargets(&globalTargets);
for (i = 0; i < this->LocalGenerators.size(); ++i) for (i = 0; i < this->LocalGenerators.size(); ++i)
{ {
this->LocalGenerators[i]->ComputeObjectMaxPath();
cmMakefile* mf = this->LocalGenerators[i]->GetMakefile(); cmMakefile* mf = this->LocalGenerators[i]->GetMakefile();
cmTargets* targets = &(mf->GetTargets()); cmTargets* targets = &(mf->GetTargets());
cmTargets::iterator tit; cmTargets::iterator tit;

2
Source/cmLocalGenerator.cxx
View File

@ -135,8 +135,6 @@ void cmLocalGenerator::Configure()
this->Makefile->AddCMakeDependFilesFromUser(); this->Makefile->AddCMakeDependFilesFromUser();
this->ComputeObjectMaxPath();
this->Makefile->SetConfigured(); this->Makefile->SetConfigured();
} }

2
Source/cmLocalGenerator.h
View File

@ -383,6 +383,7 @@ public:
bool IsMinGWMake() const; bool IsMinGWMake() const;
bool IsNMake() const; bool IsNMake() const;
void ComputeObjectMaxPath();
protected: protected:
///! put all the libraries for a target on into the given stream ///! put all the libraries for a target on into the given stream
void OutputLinkLibraries(std::string& linkLibraries, void OutputLinkLibraries(std::string& linkLibraries,
@ -428,7 +429,6 @@ protected:
std::string& CreateSafeUniqueObjectFileName(const std::string& sin, std::string& CreateSafeUniqueObjectFileName(const std::string& sin,
std::string const& dir_max); std::string const& dir_max);
void ComputeObjectMaxPath();
virtual std::string ConvertToLinkReference(std::string const& lib, virtual std::string ConvertToLinkReference(std::string const& lib,
OutputFormat format = SHELL); OutputFormat format = SHELL);