mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-06 05:40:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'interrupt-bug-12649'

Browse Source 
131eed6 cmake-gui: Improve interrupt granularity to fix bug 12649.
This commit is contained in:
David Cole
2012-02-14 16:14:35 -05:00
committed by CMake Topic Stage
parent 5b016a23d0 131eed6607
commit e65f39a59e
6 changed files with 43 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Source/cmSystemTools.h
View File

@@ -78,6 +78,11 @@ public:
///! Send a string to stderr. Stdout callbacks will not be invoced.
static void Stderr(const char* s, int length);
typedef bool (*InterruptCallback)(void*);
static void SetInterruptCallback(InterruptCallback f, void* clientData=0);
static bool GetInterruptFlag();
///! Return true if there was an error at any point.
static bool GetErrorOccuredFlag()
{
@@ -96,7 +101,7 @@ public:
///! Return true if there was an error at any point.
static bool GetFatalErrorOccured()
{
return cmSystemTools::s_FatalErrorOccured;
return cmSystemTools::s_FatalErrorOccured || GetInterruptFlag();
}
///! Set the error occured flag and fatal error back to false
@@ -467,8 +472,10 @@ private:
static bool s_DisableRunCommandOutput;
static ErrorCallback s_ErrorCallback;
static StdoutCallback s_StdoutCallback;
static InterruptCallback s_InterruptCallback;
static void* s_ErrorCallbackClientData;
static void* s_StdoutCallbackClientData;
static void* s_InterruptCallbackClientData;
static std::string s_Windows9xComspecSubstitute;
};