summaryrefslogtreecommitdiffstats
path: root/Source/kwsys/Terminal.c
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-11-13 14:48:23 (GMT)
committerBrad King <brad.king@kitware.com>2019-11-13 14:48:23 (GMT)
commitdc01c73f2d187d3a7e20527372f4e2888ffedc0a (patch)
tree4b3f5b18bbd70f2d9d51c13525d0ccd26924aac1 /Source/kwsys/Terminal.c
parent011693867ac0ee81912cca8e2289b9c584ccfb9b (diff)
parent78ce959a40c788356e304829d5f93742c5c83fa6 (diff)
downloadCMake-dc01c73f2d187d3a7e20527372f4e2888ffedc0a.zip
CMake-dc01c73f2d187d3a7e20527372f4e2888ffedc0a.tar.gz
CMake-dc01c73f2d187d3a7e20527372f4e2888ffedc0a.tar.bz2
Merge branch 'upstream-KWSys' into update-kwsys
# By KWSys Upstream * upstream-KWSys: KWSys 2019-11-13 (e67ed8ef)
Diffstat (limited to 'Source/kwsys/Terminal.c')
-rw-r--r--Source/kwsys/Terminal.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/Source/kwsys/Terminal.c b/Source/kwsys/Terminal.c
index 4dd2461..c9515ee 100644
--- a/Source/kwsys/Terminal.c
+++ b/Source/kwsys/Terminal.c
@@ -172,6 +172,14 @@ static int kwsysTerminalStreamIsVT100(FILE* stream, int default_vt100,
}
}
+ /* GNU make 4.1+ may tell us that its output is destined for a TTY. */
+ {
+ const char* termout = getenv("MAKE_TERMOUT");
+ if (termout && *termout != '\0') {
+ return 1;
+ }
+ }
+
/* If running inside emacs the terminal is not VT100. Some emacs
seem to claim the TERM is xterm even though they do not support
VT100 escapes. */