summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2024-06-11 14:55:59 (GMT)
committerBrad King <brad.king@kitware.com>2024-06-11 14:55:59 (GMT)
commit578ba814247c956c37d77e1b1d3e8735cf92d2ca (patch)
tree7abaac7d936e3b7a4ac90b753589e386ecb05151
parentfacfba088f3487a44cadf8288af47ca3383c03a0 (diff)
parent1004cc2b5205dac4d9bbc8343597ec3a2b9c7f36 (diff)
downloadCMake-578ba814247c956c37d77e1b1d3e8735cf92d2ca.zip
CMake-578ba814247c956c37d77e1b1d3e8735cf92d2ca.tar.gz
CMake-578ba814247c956c37d77e1b1d3e8735cf92d2ca.tar.bz2
Merge topic 'clang-ansi-color' into release-3.29
1004cc2b52 Clang: Drop non-existent -fno-ansi-escape-codes flag Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9592
-rw-r--r--Modules/Compiler/Clang.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/Compiler/Clang.cmake b/Modules/Compiler/Clang.cmake
index 2452d5e..e136e37 100644
--- a/Modules/Compiler/Clang.cmake
+++ b/Modules/Compiler/Clang.cmake
@@ -121,7 +121,7 @@ else()
# -fansi-escape-codes mentioned at https://releases.llvm.org/3.7.0/tools/clang/docs/UsersManual.html
if (CMAKE_HOST_WIN32 AND CMAKE_${lang}_COMPILER_VERSION VERSION_GREATER_EQUAL 3.7)
set(CMAKE_${lang}_COMPILE_OPTIONS_COLOR_DIAGNOSTICS -fansi-escape-codes -fcolor-diagnostics)
- set(CMAKE_${lang}_COMPILE_OPTIONS_COLOR_DIAGNOSTICS_OFF -fno-ansi-escape-codes -fno-color-diagnostics)
+ set(CMAKE_${lang}_COMPILE_OPTIONS_COLOR_DIAGNOSTICS_OFF -fno-color-diagnostics)
else()
set(CMAKE_${lang}_COMPILE_OPTIONS_COLOR_DIAGNOSTICS -fcolor-diagnostics)
set(CMAKE_${lang}_COMPILE_OPTIONS_COLOR_DIAGNOSTICS_OFF -fno-color-diagnostics)