summaryrefslogtreecommitdiffstats
path: root/Modules/Compiler
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2024-06-11 14:56:31 (GMT)
committerKitware Robot <kwrobot@kitware.com>2024-06-11 14:56:48 (GMT)
commit4036eafd95f8f9dfffc667c7ad2178318df0f7e2 (patch)
treef47fd4d322ec058e21566eb5c8ac83d25cbf3a2c /Modules/Compiler
parent570c6313cee04736e0c5cadfa9b0e088cee73eda (diff)
parent1004cc2b5205dac4d9bbc8343597ec3a2b9c7f36 (diff)
downloadCMake-4036eafd95f8f9dfffc667c7ad2178318df0f7e2.zip
CMake-4036eafd95f8f9dfffc667c7ad2178318df0f7e2.tar.gz
CMake-4036eafd95f8f9dfffc667c7ad2178318df0f7e2.tar.bz2
Merge topic 'clang-ansi-color' into release-3.30
1004cc2b52 Clang: Drop non-existent -fno-ansi-escape-codes flag Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9592
Diffstat (limited to 'Modules/Compiler')
-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 089b188..f09d36d 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)