diff options
| author | Brad King <brad.king@kitware.com> | 2019-01-25 13:09:28 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-01-25 13:09:37 (GMT) |
| commit | 40628b2519ae1553a33f701cf46ee8fbbd013b85 (patch) | |
| tree | 7355225a83e125ce7b650967b6798b4ebbf8739a /Source/cmGlobalGenerator.cxx | |
| parent | 24b6e4830d9027e63db7dfafa500aaeb652d3a4c (diff) | |
| parent | a6982cff0d3910723ad4fd40b9c63cf77c872d30 (diff) | |
| download | CMake-40628b2519ae1553a33f701cf46ee8fbbd013b85.zip CMake-40628b2519ae1553a33f701cf46ee8fbbd013b85.tar.gz CMake-40628b2519ae1553a33f701cf46ee8fbbd013b85.tar.bz2 | |
Merge topic 'max-recursion-depth'
a6982cff0d cmMakefile: Impose maximum recursion limit
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Juraj Oršulić <juraj.orsulic@fer.hr>
Merge-request: !2746
Diffstat (limited to 'Source/cmGlobalGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 119adaf..04af013 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -98,6 +98,8 @@ cmGlobalGenerator::cmGlobalGenerator(cmake* cm) this->ConfigureDoneCMP0026AndCMP0024 = false; this->FirstTimeProgress = 0.0f; + this->RecursionDepth = 0; + cm->GetState()->SetIsGeneratorMultiConfig(false); cm->GetState()->SetMinGWMake(false); cm->GetState()->SetMSYSShell(false); @@ -1166,6 +1168,7 @@ void cmGlobalGenerator::Configure() this->CMakeInstance->GetHomeOutputDirectory()); cmMakefile* dirMf = new cmMakefile(this, snapshot); + dirMf->SetRecursionDepth(this->RecursionDepth); this->Makefiles.push_back(dirMf); this->IndexMakefile(dirMf); |