1 files changed, 6 insertions, 7 deletions
diff --git a/config/cmake/HDFCXXCompilerFlags.cmake b/config/cmake/HDFCXXCompilerFlags.cmake
index 38db636..f06ffb0 100644
--- a/config/cmake/HDFCXXCompilerFlags.cmake
+++ b/config/cmake/HDFCXXCompilerFlags.cmake
@@ -25,15 +25,14 @@ if (WIN32 AND CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
   set (_INTEL_WINDOWS 1)
 endif ()
 
-if (WIN32 AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang"
-   AND "x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC")
+if (WIN32 AND CMAKE_CXX_COMPILER_ID MATCHES "[Cc]lang" AND "x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC")
   set (_CLANG_MSVC_WINDOWS 1)
 endif()
 
 # MSVC 14.28 enables C5105, but the Windows SDK 10.0.18362.0 triggers it.
-if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND CMAKE_CXX_COMPILER_LOADED)
+if ((_CLANG_MSVC_WINDOWS OR CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") AND CMAKE_CXX_COMPILER_LOADED)
   set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc")
-  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.28)
+  if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.28)
     set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -wd5105")
   endif ()
 endif ()
@@ -138,7 +137,7 @@ else ()
         ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-noerror-general")
       endif ()
     endif ()
-  elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+  elseif (CMAKE_CXX_COMPILER_ID MATCHES "[Cc]lang")
     ADD_H5_FLAGS (HDF5_CMAKE_CXX_FLAGS "${HDF5_SOURCE_DIR}/config/clang-warnings/general")
   elseif (CMAKE_CXX_COMPILER_ID STREQUAL "PGI")
     list (APPEND HDF5_CMAKE_CXX_FLAGS "-Minform=inform")
@@ -159,14 +158,14 @@ if (HDF5_ENABLE_DEV_WARNINGS)
   elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     # Use the C warnings as CXX warnings are the same
     ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-general")
-  elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+  elseif (CMAKE_CXX_COMPILER_ID MATCHES "[Cc]lang")
     ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/clang-warnings/developer-general")
   endif ()
 else ()
   if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     # Use the C warnings as CXX warnings are the same
     ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-general")
-  elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+  elseif (CMAKE_CXX_COMPILER_ID MATCHES "[Cc]lang")
     ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/clang-warnings/no-developer-general")
   endif ()
 endif ()