Просмотр исходного кода

cmGeneratorTarget: Require a cmLocalGenerator to construct.

Stephen Kelly 10 лет назад
Родитель
Сommit
a3b210fd6c
3 измененных файлов с 6 добавлено и 5 удалено
  1. 3 2
      Source/cmGeneratorTarget.cxx
  2. 1 1
      Source/cmGeneratorTarget.h
  3. 2 2
      Source/cmGlobalGenerator.cxx

+ 3 - 2
Source/cmGeneratorTarget.cxx

@@ -220,11 +220,12 @@ struct TagVisitor
 };
 };
 
 
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
-cmGeneratorTarget::cmGeneratorTarget(cmTarget* t): Target(t),
+cmGeneratorTarget::cmGeneratorTarget(cmTarget* t, cmLocalGenerator* lg)
+  : Target(t),
   SourceFileFlagsConstructed(false)
   SourceFileFlagsConstructed(false)
 {
 {
   this->Makefile = this->Target->GetMakefile();
   this->Makefile = this->Target->GetMakefile();
-  this->LocalGenerator = this->Makefile->GetLocalGenerator();
+  this->LocalGenerator = lg;
   this->GlobalGenerator = this->Makefile->GetGlobalGenerator();
   this->GlobalGenerator = this->Makefile->GetGlobalGenerator();
 }
 }
 
 

+ 1 - 1
Source/cmGeneratorTarget.h

@@ -24,7 +24,7 @@ class cmTarget;
 class cmGeneratorTarget
 class cmGeneratorTarget
 {
 {
 public:
 public:
-  cmGeneratorTarget(cmTarget*);
+  cmGeneratorTarget(cmTarget*, cmLocalGenerator* lg);
 
 
   cmLocalGenerator* GetLocalGenerator() const;
   cmLocalGenerator* GetLocalGenerator() const;
 
 

+ 2 - 2
Source/cmGlobalGenerator.cxx

@@ -1465,7 +1465,7 @@ void cmGlobalGenerator::CreateGeneratorTargets(cmLocalGenerator *lg)
       ti != targets.end(); ++ti)
       ti != targets.end(); ++ti)
     {
     {
     cmTarget* t = &ti->second;
     cmTarget* t = &ti->second;
-    cmGeneratorTarget* gt = new cmGeneratorTarget(t);
+    cmGeneratorTarget* gt = new cmGeneratorTarget(t, lg);
     this->ComputeTargetObjectDirectory(gt);
     this->ComputeTargetObjectDirectory(gt);
     this->GeneratorTargets[t] = gt;
     this->GeneratorTargets[t] = gt;
     generatorTargets[t] = gt;
     generatorTargets[t] = gt;
@@ -1475,7 +1475,7 @@ void cmGlobalGenerator::CreateGeneratorTargets(cmLocalGenerator *lg)
         j = mf->GetOwnedImportedTargets().begin();
         j = mf->GetOwnedImportedTargets().begin();
       j != mf->GetOwnedImportedTargets().end(); ++j)
       j != mf->GetOwnedImportedTargets().end(); ++j)
     {
     {
-    cmGeneratorTarget* gt = new cmGeneratorTarget(*j);
+    cmGeneratorTarget* gt = new cmGeneratorTarget(*j, lg);
     this->GeneratorTargets[*j] = gt;
     this->GeneratorTargets[*j] = gt;
     generatorTargets[*j] = gt;
     generatorTargets[*j] = gt;
     }
     }