diff options
| author | Brad King <brad.king@kitware.com> | 2014-05-07 10:59:02 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-05-07 11:02:16 -0400 |
| commit | 54111286453894beb69ad18a9361edc2a50efc84 (patch) | |
| tree | 2be66f856c661fde65c890374fa7ca3d5d660ed2 /Source/CTest | |
| parent | 9cb4677509aa767245cbf4bb9e655d1559bc10bd (diff) | |
| download | cmake-54111286453894beb69ad18a9361edc2a50efc84.tar.gz | |
ctest_build: Do not crash on bad generator name
If creation of the global generator fails, return early with an error
message instead of trying to use the generator and crashing.
Add a CTestTestBadGenerator test to cover this case.
Reported-by: Mathieu Malaterre <malat@debian.org>
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=747306
Diffstat (limited to 'Source/CTest')
| -rw-r--r-- | Source/CTest/cmCTestBuildCommand.cxx | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Source/CTest/cmCTestBuildCommand.cxx b/Source/CTest/cmCTestBuildCommand.cxx index 12ff71828a..b250fc329a 100644 --- a/Source/CTest/cmCTestBuildCommand.cxx +++ b/Source/CTest/cmCTestBuildCommand.cxx @@ -113,6 +113,15 @@ cmCTestGenericHandler* cmCTestBuildCommand::InitializeHandler() this->GlobalGenerator = this->Makefile->GetCMakeInstance()->CreateGlobalGenerator( cmakeGeneratorName); + if(!this->GlobalGenerator) + { + std::string e = "could not create generator named \""; + e += cmakeGeneratorName; + e += "\""; + this->Makefile->IssueMessage(cmake::FATAL_ERROR, e); + cmSystemTools::SetFatalErrorOccured(); + return 0; + } } if(strlen(cmakeBuildConfiguration) == 0) { |