diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-09-17 23:34:46 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-09-18 18:48:15 (GMT) |
| commit | b98f7712eab7fd928e7e332124b2a6fdcdfec7e6 (patch) | |
| tree | 2b2f0fcf1d81bec5799b2d0397d584ca4fd02cfe | |
| parent | b5de2bd9dea2d1b7bd2c128e0b1dff0f3bbda02b (diff) | |
| download | CMake-b98f7712eab7fd928e7e332124b2a6fdcdfec7e6.zip CMake-b98f7712eab7fd928e7e332124b2a6fdcdfec7e6.tar.gz CMake-b98f7712eab7fd928e7e332124b2a6fdcdfec7e6.tar.bz2 | |
cmGlobalGenerator: Add API for the configure step being finished.
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 5 | ||||
| -rw-r--r-- | Source/cmGlobalGenerator.h | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 33b04ac..7aa8bb6 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -72,6 +72,8 @@ cmGlobalGenerator::cmGlobalGenerator(cmake* cm) this->ExtraGenerator = 0; this->CurrentMakefile = 0; this->TryCompileOuterMakefile = 0; + + this->ConfigureDoneCMP0026 = false; } cmGlobalGenerator::~cmGlobalGenerator() @@ -1110,9 +1112,12 @@ void cmGlobalGenerator::Configure() this->CMakeInstance->GetHomeOutputDirectory()); // now do it + this->ConfigureDoneCMP0026 = false; dirMf->Configure(); dirMf->EnforceDirectoryLevelRules(); + this->ConfigureDoneCMP0026 = true; + // Put a copy of each global target in every directory. cmTargets globalTargets; this->CreateDefaultGlobalTargets(&globalTargets); diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h index 9fc2d45..40f98dc 100644 --- a/Source/cmGlobalGenerator.h +++ b/Source/cmGlobalGenerator.h @@ -363,6 +363,8 @@ public: cmFileLockPool& GetFileLockPool() { return FileLockPool; } #endif + bool GetConfigureDoneCMP0026() const { return this->ConfigureDoneCMP0026; } + std::string MakeSilentFlag; protected: typedef std::vector<cmLocalGenerator*> GeneratorVector; @@ -520,6 +522,7 @@ protected: bool ForceUnixPaths; bool ToolSupportsColor; bool InstallTargetEnabled; + bool ConfigureDoneCMP0026; }; #endif |