diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-05-30 17:34:09 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-06-04 13:06:41 (GMT) |
| commit | 0863797037b82f01cb356cb2cd4cdcef7ca8ae48 (patch) | |
| tree | 53aaecc5ba7f9c57bb97b5a56ec79532e5e024aa | |
| parent | 27e11c6fea8e863b59c0fdfd63f1e9f2528dbac4 (diff) | |
| download | CMake-0863797037b82f01cb356cb2cd4cdcef7ca8ae48.zip CMake-0863797037b82f01cb356cb2cd4cdcef7ca8ae48.tar.gz CMake-0863797037b82f01cb356cb2cd4cdcef7ca8ae48.tar.bz2 | |
cmLocalGenerator: ComputeObjectMaxPath just before generating.
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 1 | ||||
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 2 | ||||
| -rw-r--r-- | Source/cmLocalGenerator.h | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 4fa7a61..d1842c1 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -1223,6 +1223,7 @@ void cmGlobalGenerator::Generate() this->CreateDefaultGlobalTargets(&globalTargets); for (i = 0; i < this->LocalGenerators.size(); ++i) { + this->LocalGenerators[i]->ComputeObjectMaxPath(); cmMakefile* mf = this->LocalGenerators[i]->GetMakefile(); cmTargets* targets = &(mf->GetTargets()); cmTargets::iterator tit; diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 6bebaa7..8931e6f 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -135,8 +135,6 @@ void cmLocalGenerator::Configure() this->Makefile->AddCMakeDependFilesFromUser(); - this->ComputeObjectMaxPath(); - this->Makefile->SetConfigured(); } diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h index 8a1649e..c972e8f 100644 --- a/Source/cmLocalGenerator.h +++ b/Source/cmLocalGenerator.h @@ -383,6 +383,7 @@ public: bool IsMinGWMake() const; bool IsNMake() const; + void ComputeObjectMaxPath(); protected: ///! put all the libraries for a target on into the given stream void OutputLinkLibraries(std::string& linkLibraries, @@ -428,7 +429,6 @@ protected: std::string& CreateSafeUniqueObjectFileName(const std::string& sin, std::string const& dir_max); - void ComputeObjectMaxPath(); virtual std::string ConvertToLinkReference(std::string const& lib, OutputFormat format = SHELL); |