diff options
| author | Brad King <brad.king@kitware.com> | 2015-07-08 13:19:14 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-07-08 13:19:14 (GMT) |
| commit | 0d457c319934e6f321b838ea58ad4365e41f6f0b (patch) | |
| tree | cdbeee3d8fc86b17e5541a6804e026942dd31b34 | |
| parent | 66e0681ea0293aac6f3547224cef85593cbe4595 (diff) | |
| parent | 3b60232ebcde69789a6c26f5c523ad107a7099c5 (diff) | |
| download | CMake-0d457c319934e6f321b838ea58ad4365e41f6f0b.zip CMake-0d457c319934e6f321b838ea58ad4365e41f6f0b.tar.gz CMake-0d457c319934e6f321b838ea58ad4365e41f6f0b.tar.bz2 | |
Merge topic 'preserve-generator-on-failure'
3b60232e cmake: Preserve cached CMAKE_GENERATOR when an error occurs (#15640)
| -rw-r--r-- | Source/cmake.cxx | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 0570399..7bf3832 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -1439,19 +1439,6 @@ int cmake::ActualConfigure() } } - if(cmSystemTools::GetFatalErrorOccured()) - { - const char* makeProgram = - this->State->GetInitializedCacheValue("CMAKE_MAKE_PROGRAM"); - if (!makeProgram || cmSystemTools::IsOff(makeProgram)) - { - // We must have a bad generator selection. Wipe the cache entry so the - // user can select another. - this->State->RemoveCacheEntry("CMAKE_GENERATOR"); - this->State->RemoveCacheEntry("CMAKE_EXTRA_GENERATOR"); - } - } - cmMakefile* mf=this->GlobalGenerator->GetLocalGenerators()[0]->GetMakefile(); if (mf->IsOn("CTEST_USE_LAUNCHERS") && !this->State->GetGlobalProperty("RULE_LAUNCH_COMPILE")) |