summaryrefslogtreecommitdiffstats
path: root/Source/cmGeneratorTarget.cxx
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-05-03 09:10:30 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-05-03 09:42:00 (GMT)
commita0836ed97804952ace98d2c1d0d46e968a532a3c (patch)
tree11c3a118fb30c8cf6eb41eca2898251197edadeb /Source/cmGeneratorTarget.cxx
parentcbf143bb76604f576275d96a1e1e4c701680ff29 (diff)
downloadCMake-a0836ed97804952ace98d2c1d0d46e968a532a3c.zip
CMake-a0836ed97804952ace98d2c1d0d46e968a532a3c.tar.gz
CMake-a0836ed97804952ace98d2c1d0d46e968a532a3c.tar.bz2
Port to cmMakefile::GetGlobalGenerator.
Diffstat (limited to 'Source/cmGeneratorTarget.cxx')
-rw-r--r--Source/cmGeneratorTarget.cxx11
1 files changed, 4 insertions, 7 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 1a4f9c4..e2b8c45 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -132,8 +132,7 @@ struct TagVisitor
TagVisitor(cmTarget *target, DataType& data)
: Data(data), Target(target),
- GlobalGenerator(target->GetMakefile()
- ->GetLocalGenerator()->GetGlobalGenerator()),
+ GlobalGenerator(target->GetMakefile()->GetGlobalGenerator()),
Header(CM_HEADER_REGEX),
IsObjLib(target->GetType() == cmTarget::OBJECT_LIBRARY)
{
@@ -226,7 +225,7 @@ cmGeneratorTarget::cmGeneratorTarget(cmTarget* t): Target(t),
{
this->Makefile = this->Target->GetMakefile();
this->LocalGenerator = this->Makefile->GetLocalGenerator();
- this->GlobalGenerator = this->LocalGenerator->GetGlobalGenerator();
+ this->GlobalGenerator = this->Makefile->GetGlobalGenerator();
}
//----------------------------------------------------------------------------
@@ -648,8 +647,7 @@ cmTargetTraceDependencies
{
// Convenience.
this->Makefile = this->Target->GetMakefile();
- this->GlobalGenerator =
- this->Makefile->GetLocalGenerator()->GetGlobalGenerator();
+ this->GlobalGenerator = this->Makefile->GetGlobalGenerator();
this->CurrentEntry = 0;
// Queue all the source files already specified for the target.
@@ -1025,8 +1023,7 @@ void cmGeneratorTarget::GenerateTargetManifest(
return;
}
cmMakefile* mf = this->Target->GetMakefile();
- cmLocalGenerator* lg = mf->GetLocalGenerator();
- cmGlobalGenerator* gg = lg->GetGlobalGenerator();
+ cmGlobalGenerator* gg = mf->GetGlobalGenerator();
// Get the names.
std::string name;