summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2012-09-11 19:00:48 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2012-09-11 19:00:48 (GMT)
commita2e547cec7a525530560140494a74ef4ec35968b (patch)
treee49baa8ce29291f741b4cc09d78dac34ffd1bafe
parent7009b35ba5f6dc9029b0fb6d7b330abbefeb2074 (diff)
parent52ec845fce84e327216819b7b89183dbbd452636 (diff)
downloadCMake-a2e547cec7a525530560140494a74ef4ec35968b.zip
CMake-a2e547cec7a525530560140494a74ef4ec35968b.tar.gz
CMake-a2e547cec7a525530560140494a74ef4ec35968b.tar.bz2
Merge topic 'cmake-gui-interrupt-error'
52ec845 cmake-gui: Fix error status when interrupted.
-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()