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

Merge topic 'refactor-compute'

Browse Source 
616d8f02 cmGeneratorTarget: Rename method to match operation.
ec56d244 cmGlobalGenerator: Process evaluation files after target depends.
1e5349a5 cmGlobalGenerator: Access makefile from makefiles container.
This commit is contained in:
Brad King 2015-08-31 09:48:30 -04:00 committed by CMake Topic Stage
commit 9a6d7d2e54
5 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmGeneratorTarget.cxx
View File

@ -2554,7 +2554,7 @@ void cmGeneratorTarget::GetCompileDefinitions(std::vector<std::string> &list,
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void cmGeneratorTarget::GenerateTargetManifest( void cmGeneratorTarget::ComputeTargetManifest(
const std::string& config) const const std::string& config) const
{ {
if (this->Target->IsImported()) if (this->Target->IsImported())

2
Source/cmGeneratorTarget.h
View File

@ -251,7 +251,7 @@ public:
const std::string& config) const; const std::string& config) const;
/** Add the target output files to the global generator manifest. */ /** 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 * Trace through the source files in this target and add al source files

9
Source/cmGlobalGenerator.cxx
View File

@ -1325,11 +1325,9 @@ void cmGlobalGenerator::Generate()
// Compute the manifest of main targets generated. // Compute the manifest of main targets generated.
for (i = 0; i < this->LocalGenerators.size(); ++i) for (i = 0; i < this->LocalGenerators.size(); ++i)
{ {
this->LocalGenerators[i]->GenerateTargetManifest(); this->LocalGenerators[i]->ComputeTargetManifest();
} }
this->ProcessEvaluationFiles();
// Compute the inter-target dependencies. // Compute the inter-target dependencies.
if(!this->ComputeTargetDepends()) if(!this->ComputeTargetDepends())
{ {
@ -1340,6 +1338,8 @@ void cmGlobalGenerator::Generate()
// it builds by default. // it builds by default.
this->InitializeProgressMarks(); this->InitializeProgressMarks();
this->ProcessEvaluationFiles();
for (i = 0; i < this->LocalGenerators.size(); ++i) for (i = 0; i < this->LocalGenerators.size(); ++i)
{ {
this->LocalGenerators[i]->ComputeHomeRelativeOutputPath(); this->LocalGenerators[i]->ComputeHomeRelativeOutputPath();
@ -1668,8 +1668,7 @@ void cmGlobalGenerator::CheckTargetProperties()
text += "\n linked by target \""; text += "\n linked by target \"";
text += l->second.GetName(); text += l->second.GetName();
text += "\" in directory "; text += "\" in directory ";
text+=this->LocalGenerators[i]->GetMakefile() text+=this->Makefiles[i]->GetCurrentSourceDirectory();
->GetCurrentSourceDirectory();
notFoundMap[varName] = text; notFoundMap[varName] = text;
} }
} }

4
Source/cmLocalGenerator.cxx
View File

@ -447,7 +447,7 @@ void cmLocalGenerator::GenerateInstallRules()
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void cmLocalGenerator::GenerateTargetManifest() void cmLocalGenerator::ComputeTargetManifest()
{ {
// Collect the set of configuration types. // Collect the set of configuration types.
std::vector<std::string> configNames; std::vector<std::string> configNames;
@ -475,7 +475,7 @@ void cmLocalGenerator::GenerateTargetManifest()
ci != configNames.end(); ++ci) ci != configNames.end(); ++ci)
{ {
const char* config = ci->c_str(); const char* config = ci->c_str();
target.GenerateTargetManifest(config); target.ComputeTargetManifest(config);
} }
} }
} }

2
Source/cmLocalGenerator.h
View File

@ -66,7 +66,7 @@ public:
/** /**
* Generate a manifest of target files that will be built. * Generate a manifest of target files that will be built.
*/ */
void GenerateTargetManifest(); void ComputeTargetManifest();
///! Get the makefile for this generator ///! Get the makefile for this generator
cmMakefile *GetMakefile() { cmMakefile *GetMakefile() {