summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Clegg <sbc@chromium.org>2020-04-09 13:50:11 -0400
committerGitHub <noreply@github.com>2020-04-09 10:50:11 -0700
commit88b2b6411e13ed08d3d10fd77749d8e536d71c4c (patch)
tree0563116445c6a9f3f6d1a6dc2e0d3c0cfa0e192d
parentf5df71a54ffdf1145dbd679726afa9b89321ba30 (diff)
downloadbinaryen-88b2b6411e13ed08d3d10fd77749d8e536d71c4c.tar.gz
binaryen-88b2b6411e13ed08d3d10fd77749d8e536d71c4c.tar.bz2
binaryen-88b2b6411e13ed08d3d10fd77749d8e536d71c4c.zip
Enable color diagnostics with ninja+gcc (#2739)
-rw-r--r--CMakeLists.txt10
1 files changed, 6 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2deda249b..34aa04649 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -225,10 +225,12 @@ if(EMSCRIPTEN)
endif()
# clang doesn't print colored diagnostics when invoked from Ninja
-if(UNIX AND
- CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND
- CMAKE_GENERATOR STREQUAL "Ninja")
- add_compile_flag("-fcolor-diagnostics")
+if(UNIX AND CMAKE_GENERATOR STREQUAL "Ninja")
+ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+ add_compile_flag("-fdiagnostics-color=always")
+ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+ add_compile_flag("-fcolor-diagnostics")
+ endif()
endif()
# Static libraries