diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-09-16 20:08:22 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-10-14 17:32:09 (GMT) |
| commit | 488723f5cd9bec3f7b35b26c89ce2d92ad7d4db4 (patch) | |
| tree | 9d4abfce9ebe0608ade61c5dab3364d89b899508 /Source/cmGlobalGenerator.h | |
| parent | 1583440509a148d216d6691cdaeede1aa24af95c (diff) | |
| download | CMake-488723f5cd9bec3f7b35b26c89ce2d92ad7d4db4.zip CMake-488723f5cd9bec3f7b35b26c89ce2d92ad7d4db4.tar.gz CMake-488723f5cd9bec3f7b35b26c89ce2d92ad7d4db4.tar.bz2 | |
cmMakefile: Store container of cmExportBuildFileGenerators.
Set a cmLocalGenerator on each instance at compute time. That will
soon be needed to access cmGeneratorTarget instances.
If a cmExportBuildFileGenerator is processed early during configure time as a
result of CMP0024 it must be removed from the list to process later at generate
time.
Diffstat (limited to 'Source/cmGlobalGenerator.h')
| -rw-r--r-- | Source/cmGlobalGenerator.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h index 55e3766..fc81708 100644 --- a/Source/cmGlobalGenerator.h +++ b/Source/cmGlobalGenerator.h @@ -362,7 +362,10 @@ public: cmFileLockPool& GetFileLockPool() { return FileLockPool; } #endif - bool GetConfigureDoneCMP0026() const { return this->ConfigureDoneCMP0026; } + bool GetConfigureDoneCMP0026() const + { return this->ConfigureDoneCMP0026AndCMP0024; } + + void ComputeBuildFileGenerators(); std::string MakeSilentFlag; protected: @@ -520,7 +523,7 @@ protected: bool ForceUnixPaths; bool ToolSupportsColor; bool InstallTargetEnabled; - bool ConfigureDoneCMP0026; + bool ConfigureDoneCMP0026AndCMP0024; }; #endif |