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

cmGlobalGenerator: Compute export() related classes early. 

Simplify CMP0024 handling.
This commit is contained in:
Stephen Kelly 2015-10-17 13:29:46 +02:00
parent 37ab74a607
commit 65911cae4d
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/cmGlobalGenerator.cxx
View File

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

4
Source/cmGlobalGenerator.h
View File

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

1
Source/cmIncludeCommand.cxx
View File

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