kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'preserve-generator-on-failure'

Browse Source 
3b60232e cmake: Preserve cached CMAKE_GENERATOR when an error occurs (#15640)
This commit is contained in:
Brad King 2015-07-08 09:19:14 -04:00 committed by CMake Topic Stage
commit 0d457c3199
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/cmake.cxx
View File

@ -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(); cmMakefile* mf=this->GlobalGenerator->GetLocalGenerators()[0]->GetMakefile();
if (mf->IsOn("CTEST_USE_LAUNCHERS") if (mf->IsOn("CTEST_USE_LAUNCHERS")
&& !this->State->GetGlobalProperty("RULE_LAUNCH_COMPILE")) && !this->State->GetGlobalProperty("RULE_LAUNCH_COMPILE"))