summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-08-02 17:42:31 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-08-07 02:10:28 (GMT)
commit32f131b0ca68bc88bbb32dbf03e76dfba24defe5 (patch)
treef668305357dca6999b8d19905617b408632aa82a
parent22590805bffe74c3b4998152556561a2c2b6d177 (diff)
downloadCMake-32f131b0ca68bc88bbb32dbf03e76dfba24defe5.zip
CMake-32f131b0ca68bc88bbb32dbf03e76dfba24defe5.tar.gz
CMake-32f131b0ca68bc88bbb32dbf03e76dfba24defe5.tar.bz2
cmGeneratorTarget: Prefer the local generator to access the global.
-rw-r--r--Source/cmGeneratorTarget.cxx7
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index c831704..b19856d 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -234,7 +234,7 @@ cmGeneratorTarget::cmGeneratorTarget(cmTarget* t, cmLocalGenerator* lg)
{
this->Makefile = this->Target->GetMakefile();
this->LocalGenerator = lg;
- this->GlobalGenerator = this->Makefile->GetGlobalGenerator();
+ this->GlobalGenerator = this->LocalGenerator->GetGlobalGenerator();
}
cmGeneratorTarget::~cmGeneratorTarget()
@@ -1556,7 +1556,7 @@ cmTargetTraceDependencies
{
// Convenience.
this->Makefile = this->Target->GetMakefile();
- this->GlobalGenerator = this->Makefile->GetGlobalGenerator();
+ this->GlobalGenerator = target->GetLocalGenerator()->GetGlobalGenerator();
this->CurrentEntry = 0;
// Queue all the source files already specified for the target.
@@ -1944,8 +1944,7 @@ void cmGeneratorTarget::GenerateTargetManifest(
{
return;
}
- cmMakefile* mf = this->Target->GetMakefile();
- cmGlobalGenerator* gg = mf->GetGlobalGenerator();
+ cmGlobalGenerator* gg = this->LocalGenerator->GetGlobalGenerator();
// Get the names.
std::string name;