File tree Expand file tree Collapse file tree 1 file changed +2
-8
lines changed
Expand file tree Collapse file tree 1 file changed +2
-8
lines changed Original file line number Diff line number Diff line change @@ -28,15 +28,9 @@ if (CCMATH_PROJECT_IS_TOP_LEVEL)
2828 # Enable colored output for C++ compilers
2929 if ("${CMAKE_CXX_COMPILER_ID} " STREQUAL "GNU" )
3030 SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-color=always" )
31- elseif ("${CMAKE_CXX_COMPILER_ID} " STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID} " STREQUAL "AppleClang" )
31+ elseif ("${CMAKE_CXX_COMPILER_ID} " STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID} " STREQUAL "AppleClang" OR " ${CMAKE_CXX_COMPILER_ID} " STREQUAL "IntelLLVM" )
3232 SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fcolor-diagnostics" )
3333 endif ()
34- # Enable colored output for C compilers
35- if ("${CMAKE_C_COMPILER_ID} " STREQUAL "GNU" )
36- SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fdiagnostics-color=always" )
37- elseif ("${CMAKE_C_COMPILER_ID} " STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID} " STREQUAL "AppleClang" )
38- SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fcolor-diagnostics" )
39- endif ()
4034 endif ()
4135endif ()
4236
@@ -52,7 +46,7 @@ include(cmake/config/UserOptions.cmake)
5246# Collect common warning flags for various compilers and conditions.
5347set (
5448 ccmath_warning_options
55- $<$<NOT :$<CXX_COMPILER_ID:MSVC >>:-Wall -Wextra -Wconversion -Wpedantic -Werror=return-type -Wundef -Wshadow - Wnull-dereference>
49+ $<$<NOT :$<CXX_COMPILER_ID:MSVC >>:-Wall -Wextra -Wconversion -Wpedantic -Werror=return-type -Wundef -Wnull-dereference>
5650 $<$<CXX_COMPILER_ID:Clang>:-Wpedantic-macros >
5751 $<$<CXX_COMPILER_ID:MSVC >:/W4 /permissive- /we4715>
5852)
You can’t perform that action at this time.
0 commit comments