diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-05-30 17:26:32 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-06-04 13:06:40 (GMT) |
| commit | 27e11c6fea8e863b59c0fdfd63f1e9f2528dbac4 (patch) | |
| tree | bbd3f87ecf807594738b5188889936813f6cc28b /Source/cmLocalGenerator.cxx | |
| parent | 363caa2fa540190ea394122fca3cb72d951823ad (diff) | |
| download | CMake-27e11c6fea8e863b59c0fdfd63f1e9f2528dbac4.zip CMake-27e11c6fea8e863b59c0fdfd63f1e9f2528dbac4.tar.gz CMake-27e11c6fea8e863b59c0fdfd63f1e9f2528dbac4.tar.bz2 | |
Merge Configure state with GeneratingBuildSystem state.
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index c686ab1..6bebaa7 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -59,7 +59,6 @@ cmLocalGenerator::cmLocalGenerator(cmGlobalGenerator* gg, this->Makefile = new cmMakefile(this); this->LinkScriptShell = false; - this->Configured = false; this->EmitUniversalBinaryFlags = true; this->BackwardsCompatibility = 0; this->BackwardsCompatibilityFinal = false; @@ -128,7 +127,7 @@ void cmLocalGenerator::Configure() std::vector<cmLocalGenerator *>::iterator sdi = subdirs.begin(); for (; sdi != subdirs.end(); ++sdi) { - if (!(*sdi)->Configured) + if (!(*sdi)->GetMakefile()->IsConfigured()) { this->Makefile->ConfigureSubDirectory(*sdi); } @@ -138,7 +137,7 @@ void cmLocalGenerator::Configure() this->ComputeObjectMaxPath(); - this->Configured = true; + this->Makefile->SetConfigured(); } //---------------------------------------------------------------------------- @@ -3179,11 +3178,6 @@ bool cmLocalGenerator::IsNMake() const return this->GetState()->UseNMake(); } -void cmLocalGenerator::SetConfiguredCMP0014(bool configured) -{ - this->Configured = configured; -} - //---------------------------------------------------------------------------- std::string cmLocalGenerator @@ -3465,7 +3459,7 @@ cmIML_INT_uint64_t cmLocalGenerator::GetBackwardsCompatibility() } } this->BackwardsCompatibility = CMake_VERSION_ENCODE(major, minor, patch); - this->BackwardsCompatibilityFinal = this->Configured; + this->BackwardsCompatibilityFinal = this->Makefile->IsConfigured(); } return this->BackwardsCompatibility; |