mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-08 14:50:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

KWSys 2021-05-05 (e9ca4104)

Browse Source 
Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit e9ca4104e816c28e3fcf94ce69fd75ca9498f4a7 (master).

Upstream Shortlog
-----------------

Ben Boeckel (1):
      99ffa991 cmake: clear some configure checks when the deployment target changes

Martin Willers (2):
      bbf6cdef Terminal: Simplify CLICOLOR_FORCE check
      f308fcfb Terminal: Disable color output when CLICOLOR is set to 0
This commit is contained in:
KWSys Upstream
2021-05-05 09:19:02 -04:00
committed by Brad King
parent 18513fa118
commit 04c6e736f6
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@@ -98,6 +98,16 @@ foreach(p
endif()
endforeach()
# Some configure checks depend upon the deployment target. Clear checks when
# the deployment target changes.
if (APPLE)
if (NOT CMAKE_OSX_DEPLOYMENT_TARGET STREQUAL KWSYS_LAST_OSX_DEPLOYMENT_TARGET)
unset(KWSYS_CXX_HAS_UTIMENSAT CACHE)
endif ()
set(KWSYS_LAST_OSX_DEPLOYMENT_TARGET "${CMAKE_OSX_DEPLOYMENT_TARGET}"
CACHE INTERNAL "remember the last deployment target to trigger configure rechecks")
endif ()
#-----------------------------------------------------------------------------
# If a namespace is not specified, use "kwsys" and enable testing.
# This should be the case only when kwsys is not included inside

11
Terminal.c
View File

@@ -167,12 +167,19 @@ 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 && *clicolor_force &&
strcmp(clicolor_force, "0") != 0) {
if (clicolor_force && strcmp(clicolor_force, "0") != 0) {
return 1;
}
}
/* Disable color according to http://bixense.com/clicolors/ convention. */
{
const char* clicolor = getenv("CLICOLOR");
if (clicolor && strcmp(clicolor, "0") == 0) {
return 0;
}
}
/* GNU make 4.1+ may tell us that its output is destined for a TTY. */
{
const char* termout = getenv("MAKE_TERMOUT");