summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-11-15 14:20:47 (GMT)
committerBrad King <brad.king@kitware.com>2019-11-15 14:21:08 (GMT)
commit0b9f1cc96b5babb10f14781648b02f9a28124cbc (patch)
tree142e2b2179a428e395553013cc11330d0c8bc3be /Source
parent1d78e1a966912d35e1dea0e986bc0b977141e880 (diff)
parent9e27e52d4b0fee729f9a3bef710efed290ef9900 (diff)
downloadCMake-0b9f1cc96b5babb10f14781648b02f9a28124cbc.zip
CMake-0b9f1cc96b5babb10f14781648b02f9a28124cbc.tar.gz
CMake-0b9f1cc96b5babb10f14781648b02f9a28124cbc.tar.bz2
Merge branch 'upstream-KWSys' into win-no-error-popup
* upstream-KWSys: KWSys 2019-11-15 (329d8c7c)
Diffstat (limited to 'Source')
-rw-r--r--Source/kwsys/SystemTools.cxx6
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx
index dcf05da..39873e6 100644
--- a/Source/kwsys/SystemTools.cxx
+++ b/Source/kwsys/SystemTools.cxx
@@ -4666,8 +4666,12 @@ void SystemTools::ClassFinalize()
# include <stdlib.h>
namespace KWSYS_NAMESPACE {
-static int SystemToolsDebugReport(int, char* message, int*)
+static int SystemToolsDebugReport(int, char* message, int* ret)
{
+ if (ret) {
+ // Pretend user clicked on Retry button in popup.
+ *ret = 1;
+ }
fprintf(stderr, "%s", message);
fflush(stderr);
return 1; // no further reporting required