summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-05-07 15:14:04 (GMT)
committerBrad King <brad.king@kitware.com>2014-05-07 15:14:04 (GMT)
commit2673b9394eb156ecd47f3cb683abfd3ea15a1ad1 (patch)
treeb65e8f9ba9c669a79283208b9e2aab9c2f8e2e43 /Source
parentd9889e002d243c69ce6c374d2ef75a76a831f749 (diff)
parent54111286453894beb69ad18a9361edc2a50efc84 (diff)
downloadCMake-2673b9394eb156ecd47f3cb683abfd3ea15a1ad1.zip
CMake-2673b9394eb156ecd47f3cb683abfd3ea15a1ad1.tar.gz
CMake-2673b9394eb156ecd47f3cb683abfd3ea15a1ad1.tar.bz2
Merge branch 'ctest-bad-generator' into release
Diffstat (limited to 'Source')
-rw-r--r--Source/CTest/cmCTestBuildCommand.cxx9
1 files changed, 9 insertions, 0 deletions
diff --git a/Source/CTest/cmCTestBuildCommand.cxx b/Source/CTest/cmCTestBuildCommand.cxx
index 12ff718..b250fc3 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)
{