summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClinton Stimpson <clinton@elemtech.com>2012-09-04 14:50:21 (GMT)
committerClinton Stimpson <clinton@elemtech.com>2012-09-04 14:52:06 (GMT)
commit52ec845fce84e327216819b7b89183dbbd452636 (patch)
tree934fb460cc22804da8af999eed90e6c787a7d0b9
parent6ef858b50195ece350800de746e5c8126dfbae94 (diff)
downloadCMake-52ec845fce84e327216819b7b89183dbbd452636.zip
CMake-52ec845fce84e327216819b7b89183dbbd452636.tar.gz
CMake-52ec845fce84e327216819b7b89183dbbd452636.tar.bz2
cmake-gui: Fix error status when interrupted.
Sometimes it wasn't returning an error and one could continue with the generate generate as if no errors occurred, and even with an incomplete configure step.
-rw-r--r--Source/cmSystemTools.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h
index 69673c9..0b2def2 100644
--- a/Source/cmSystemTools.h
+++ b/Source/cmSystemTools.h
@@ -92,7 +92,8 @@ public:
static bool GetErrorOccuredFlag()
{
return cmSystemTools::s_ErrorOccured ||
- cmSystemTools::s_FatalErrorOccured;
+ cmSystemTools::s_FatalErrorOccured ||
+ GetInterruptFlag();
}
///! If this is set to true, cmake stops processing commands.
static void SetFatalErrorOccured()