diff options
author | Brad King <brad.king@kitware.com> | 2021-05-06 16:10:25 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2021-05-06 16:10:31 (GMT) |
commit | 5cbbe3d301838b361f7ff9ae7e09dc10ce089957 (patch) | |
tree | 06dbb1b610338d7c4a56c24eb92a1824cdbb6259 | |
parent | e0b4a22ca6874a15912eea86cde16f47cb5f9d93 (diff) | |
parent | 4141866dfeb1aab857d8ad8c2c11acde3f290eb3 (diff) | |
download | CMake-5cbbe3d301838b361f7ff9ae7e09dc10ce089957.zip CMake-5cbbe3d301838b361f7ff9ae7e09dc10ce089957.tar.gz CMake-5cbbe3d301838b361f7ff9ae7e09dc10ce089957.tar.bz2 |
Merge topic 'update-kwsys'
4141866dfe Merge branch 'upstream-KWSys' into update-kwsys
760bdfb26e KWSys 2021-05-06 (2fa93cfc)
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6095
-rw-r--r-- | Source/kwsys/Terminal.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/kwsys/Terminal.c b/Source/kwsys/Terminal.c index 57a68bf..20bb5fe 100644 --- a/Source/kwsys/Terminal.c +++ b/Source/kwsys/Terminal.c @@ -167,7 +167,8 @@ static int kwsysTerminalStreamIsVT100(FILE* stream, int default_vt100, /* Force color according to http://bixense.com/clicolors/ convention. */ { const char* clicolor_force = getenv("CLICOLOR_FORCE"); - if (clicolor_force && strcmp(clicolor_force, "0") != 0) { + if (clicolor_force && *clicolor_force && + strcmp(clicolor_force, "0") != 0) { return 1; } } |