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

cmGlobalGenerator: Compute export() related classes early.

Simplify CMP0024 handling.
Stephen Kelly 10 лет назад
Родитель
Сommit
65911cae4d
3 измененных файлов с 3 добавлено и 5 удалено
  1. 1 2
      Source/cmGlobalGenerator.cxx
  2. 2 2
      Source/cmGlobalGenerator.h
  3. 0 1
      Source/cmIncludeCommand.cxx

+ 1 - 2
Source/cmGlobalGenerator.cxx

@@ -1199,6 +1199,7 @@ void cmGlobalGenerator::CreateGenerationObjects(TargetTypes targetTypes)
   cmDeleteAll(this->GeneratorTargets);
   this->GeneratorTargets.clear();
   this->CreateGeneratorTargets(targetTypes);
+  this->ComputeBuildFileGenerators();
 }
 
 cmExportBuildFileGenerator*
@@ -1279,8 +1280,6 @@ bool cmGlobalGenerator::Compute()
       this->CreateQtAutoGeneratorsTargets();
 #endif
 
-  this->ComputeBuildFileGenerators();
-
   unsigned int i;
 
   // Add generator specific helper commands

+ 2 - 2
Source/cmGlobalGenerator.h

@@ -365,8 +365,6 @@ public:
   bool GetConfigureDoneCMP0026() const
   { return this->ConfigureDoneCMP0026AndCMP0024; }
 
-  void ComputeBuildFileGenerators();
-
   std::string MakeSilentFlag;
 protected:
   typedef std::vector<cmLocalGenerator*> GeneratorVector;
@@ -471,6 +469,8 @@ private:
   void CheckCompilerIdCompatibility(cmMakefile* mf,
                                     std::string const& lang) const;
 
+  void ComputeBuildFileGenerators();
+
   cmExternalMakefileProjectGenerator* ExtraGenerator;
 
   // track files replaced during a Generate

+ 0 - 1
Source/cmIncludeCommand.cxx

@@ -126,7 +126,6 @@ bool cmIncludeCommand
         }
       }
     gg->CreateGenerationObjects();
-    gg->ComputeBuildFileGenerators();
     gg->GenerateImportFile(fname_abs);
     }