diff options
author | Bill Hoffman <bill.hoffman@kitware.com> | 2008-03-13 01:06:32 (GMT) |
---|---|---|
committer | Bill Hoffman <bill.hoffman@kitware.com> | 2008-03-13 01:06:32 (GMT) |
commit | 5ab6c0f0ed39136bd778a6f982691e5142a7aceb (patch) | |
tree | 69b11472960aa7b64dea7527c42526a66671c197 /Source/cmSourceFileLocation.cxx | |
parent | 8bf388109d1d95d1f269b6e78c90e88f217bafa3 (diff) | |
download | CMake-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/cmSourceFileLocation.cxx')
-rw-r--r-- | Source/cmSourceFileLocation.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Source/cmSourceFileLocation.cxx b/Source/cmSourceFileLocation.cxx index 159f22f..71c2f8f 100644 --- a/Source/cmSourceFileLocation.cxx +++ b/Source/cmSourceFileLocation.cxx @@ -173,7 +173,13 @@ bool cmSourceFileLocation::Matches(cmSourceFileLocation const& loc) // Each side has a directory relative to a different location. // This can occur when referencing a source file from a different // directory. This is not yet allowed. - abort(); + this->Makefile-> + IssueMessage(cmake::INTERNAL_ERROR, + "Matches error: Each side has a directory relative to a different" + " location. This can occur when referencing a " + "source file from a different directory. " + "This is not yet allowed."); + return false; } else if(this->AmbiguousDirectory) { |