Merge pull request #16438 from masterleinad/icpx_clang_like

Treat ICPX as gcc-style compiler
dealii · Jan 19, 2024 · a0ef1c9 · a0ef1c9
2 parents 54eac45 + bab32d7
commit a0ef1c9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/cmake/setup_compiler_flags.cmake b/cmake/setup_compiler_flags.cmake
@@ -98,7 +98,8 @@ endforeach()
 ########################################################################
 
 if( CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR
-    CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
+    CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR
+    CMAKE_CXX_COMPILER_ID MATCHES "IntelLLVM")
   #
   # General setup for GCC and compilers sufficiently close to GCC:
   #

diff --git a/cmake/setup_compiler_flags_gnu.cmake b/cmake/setup_compiler_flags_gnu.cmake
@@ -96,7 +96,7 @@ enable_if_supported(DEAL_II_WARNING_FLAGS "-Wno-literal-suffix")
 #
 enable_if_supported(DEAL_II_WARNING_FLAGS "-Wno-psabi")
 
-if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "IntelLLVM")
   # Enable warnings for conversion from real types to integer types.
   # The warning is too noisy in gcc and therefore only enabled for clang.
   enable_if_supported(DEAL_II_WARNING_FLAGS "-Wfloat-conversion")