summaryrefslogtreecommitdiffstats
path: root/Source/cmMakefile.cxx
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2008-03-13 01:06:32 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2008-03-13 01:06:32 (GMT)
commit5ab6c0f0ed39136bd778a6f982691e5142a7aceb (patch)
tree69b11472960aa7b64dea7527c42526a66671c197 /Source/cmMakefile.cxx
parent8bf388109d1d95d1f269b6e78c90e88f217bafa3 (diff)
downloadCMake-5ab6c0f0ed39136bd778a6f982691e5142a7aceb.zip
CMake-5ab6c0f0ed39136bd778a6f982691e5142a7aceb.tar.gz
CMake-5ab6c0f0ed39136bd778a6f982691e5142a7aceb.tar.bz2
ENH: remove abort calls and replace with an IssueMessage INTERANL_ERROR, better to not crash on the end user.
Diffstat (limited to 'Source/cmMakefile.cxx')
-rw-r--r--Source/cmMakefile.cxx9
1 files changed, 8 insertions, 1 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index c39599d..1960f04 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -295,6 +295,11 @@ void cmMakefile::IssueMessage(cmake::MessageType t,
isError = true;
msg << "CMake Error:";
}
+ else if(t == cmake::INTERNAL_ERROR)
+ {
+ isError = true;
+ msg << "CMake Internal Error, please report a bug: ";
+ }
else
{
msg << "CMake Warning";
@@ -2029,7 +2034,9 @@ const char *cmMakefile::ExpandVariablesInString(std::string& source,
{
// This case should never be called. At-only is for
// configure-file/string which always does no escapes.
- abort();
+ this->IssueMessage(cmake::INTERNAL_ERROR,
+ "ExpandVariablesInString @ONLY called "
+ "on something with escapes.");
}
// Store an original copy of the input.