diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-10-17 11:29:46 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-10-18 14:29:29 (GMT) |
| commit | 65911cae4dd5a81f23a59bf9187b95bda3168fe9 (patch) | |
| tree | d0ad801d2209f187b4605fd0b5e79201d739747e | |
| parent | 37ab74a607a021567a0a1e2c7df43da33d32d5ec (diff) | |
| download | CMake-65911cae4dd5a81f23a59bf9187b95bda3168fe9.zip CMake-65911cae4dd5a81f23a59bf9187b95bda3168fe9.tar.gz CMake-65911cae4dd5a81f23a59bf9187b95bda3168fe9.tar.bz2 | |
cmGlobalGenerator: Compute export() related classes early.
Simplify CMP0024 handling.
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 3 | ||||
| -rw-r--r-- | Source/cmGlobalGenerator.h | 4 | ||||
| -rw-r--r-- | Source/cmIncludeCommand.cxx | 1 |
3 files changed, 3 insertions, 5 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index a42ea22..9d54f6f 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/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 diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h index 6887409..ad8992f 100644 --- a/Source/cmGlobalGenerator.h +++ b/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 diff --git a/Source/cmIncludeCommand.cxx b/Source/cmIncludeCommand.cxx index 97d4d56..8890e2b 100644 --- a/Source/cmIncludeCommand.cxx +++ b/Source/cmIncludeCommand.cxx @@ -126,7 +126,6 @@ bool cmIncludeCommand } } gg->CreateGenerationObjects(); - gg->ComputeBuildFileGenerators(); gg->GenerateImportFile(fname_abs); } |