From 1e5349a5a0162cf5f75639717d374e73358df7b2 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Tue, 25 Aug 2015 08:21:22 +0200 Subject: cmGlobalGenerator: Access makefile from makefiles container. --- Source/cmGlobalGenerator.cxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 46c1ccc..97fa823 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -1669,8 +1669,7 @@ void cmGlobalGenerator::CheckLocalGenerators() text += "\n linked by target \""; text += l->second.GetName(); text += "\" in directory "; - text+=this->LocalGenerators[i]->GetMakefile() - ->GetCurrentSourceDirectory(); + text+=this->Makefiles[i]->GetCurrentSourceDirectory(); notFoundMap[varName] = text; } } -- cgit v0.12 From ec56d244512ae87e4e3e1fcf01aa0ef80ead8763 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Sat, 29 Aug 2015 09:18:01 +0200 Subject: cmGlobalGenerator: Process evaluation files after target depends. No need to generate the files if computation aborts generation. --- Source/cmGlobalGenerator.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 97fa823..e6cbce3 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -1330,8 +1330,6 @@ void cmGlobalGenerator::Generate() this->LocalGenerators[i]->GenerateTargetManifest(); } - this->ProcessEvaluationFiles(); - // Compute the inter-target dependencies. if(!this->ComputeTargetDepends()) { @@ -1342,6 +1340,8 @@ void cmGlobalGenerator::Generate() // it builds by default. this->InitializeProgressMarks(); + this->ProcessEvaluationFiles(); + for (i = 0; i < this->LocalGenerators.size(); ++i) { this->LocalGenerators[i]->ComputeHomeRelativeOutputPath(); -- cgit v0.12 From 616d8f02d53b9a0c2ec5c85a6b1afc17081d1e2e Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Tue, 25 Aug 2015 08:25:12 +0200 Subject: cmGeneratorTarget: Rename method to match operation. The manifest is computed, not generated, according to current language used in cmake method naming. --- Source/cmGeneratorTarget.cxx | 2 +- Source/cmGeneratorTarget.h | 2 +- Source/cmGlobalGenerator.cxx | 2 +- Source/cmLocalGenerator.cxx | 4 ++-- Source/cmLocalGenerator.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index 4a1a7a2..09387b7 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -2554,7 +2554,7 @@ void cmGeneratorTarget::GetCompileDefinitions(std::vector &list, } //---------------------------------------------------------------------------- -void cmGeneratorTarget::GenerateTargetManifest( +void cmGeneratorTarget::ComputeTargetManifest( const std::string& config) const { if (this->Target->IsImported()) diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h index 2c8467f..06d9a1f 100644 --- a/Source/cmGeneratorTarget.h +++ b/Source/cmGeneratorTarget.h @@ -251,7 +251,7 @@ public: const std::string& config) const; /** Add the target output files to the global generator manifest. */ - void GenerateTargetManifest(const std::string& config) const; + void ComputeTargetManifest(const std::string& config) const; /** * Trace through the source files in this target and add al source files diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index e6cbce3..a2885c0 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -1327,7 +1327,7 @@ void cmGlobalGenerator::Generate() // Compute the manifest of main targets generated. for (i = 0; i < this->LocalGenerators.size(); ++i) { - this->LocalGenerators[i]->GenerateTargetManifest(); + this->LocalGenerators[i]->ComputeTargetManifest(); } // Compute the inter-target dependencies. diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 7ce4819..f73e12f 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -450,7 +450,7 @@ void cmLocalGenerator::GenerateInstallRules() } //---------------------------------------------------------------------------- -void cmLocalGenerator::GenerateTargetManifest() +void cmLocalGenerator::ComputeTargetManifest() { // Collect the set of configuration types. std::vector configNames; @@ -478,7 +478,7 @@ void cmLocalGenerator::GenerateTargetManifest() ci != configNames.end(); ++ci) { const char* config = ci->c_str(); - target.GenerateTargetManifest(config); + target.ComputeTargetManifest(config); } } } diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h index 915814b..2f0971e 100644 --- a/Source/cmLocalGenerator.h +++ b/Source/cmLocalGenerator.h @@ -67,7 +67,7 @@ public: /** * Generate a manifest of target files that will be built. */ - void GenerateTargetManifest(); + void ComputeTargetManifest(); ///! Get the makefile for this generator cmMakefile *GetMakefile() { -- cgit v0.12