Fixed the CMake processing for C++ warnings and flags (#888)

2 files changed, 335 insertions, 266 deletions

diff --git a/config/cmake/HDFCXXCompilerFlags.cmake b/config/cmake/HDFCXXCompilerFlags.cmake
index bd14a0d..dc982c1 100644
--- a/config/cmake/HDFCXXCompilerFlags.cmake
+++ b/config/cmake/HDFCXXCompilerFlags.cmake
@@ -9,17 +9,45 @@
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
+ENABLE_LANGUAGE (CXX)
+
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
+
 set(CMAKE_CXX_EXTENSIONS OFF)
 
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_SANITIZER_FLAGS} ${CMAKE_CXX_FLAGS}")
 if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-  message (VERBOSE "Warnings Configuration: CXX default:  ${CMAKE_CXX_FLAGS}")
+  message (VERBOSE "Warnings Configuration: CXX default: ${CMAKE_CXX_FLAGS}")
 endif ()
 #-----------------------------------------------------------------------------
 # Compiler specific flags : Shouldn't there be compiler tests for these
 #-----------------------------------------------------------------------------
+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")
+  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 NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.28)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -wd5105")
+endif()
+
+if (CMAKE_CXX_COMPILER_ID STREQUAL SunPro AND
+    NOT DEFINED CMAKE_CXX${CMAKE_CXX_STANDARD}_STANDARD_COMPILE_OPTION)
+  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.13)
+    if (NOT CMAKE_CXX_STANDARD OR CMAKE_CXX_STANDARD EQUAL 98)
+      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++03")
+    endif()
+  else()
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -library=stlport4")
+  endif()
+endif()
+
 if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_LOADED)
   set (CMAKE_CXX_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_CXX_FLAGS}")
   if (${HDF_CFG_NAME} MATCHES "Debug")
@@ -71,163 +99,167 @@ endif ()
 # HDF5 library compile options
 #-----------------------------------------------------------------------------
 
-if (NOT MSVC AND NOT MINGW)
-  if (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
-    list (APPEND HDF5_CMAKE_CXX_FLAGS "-erroff=%none -DBSD_COMP")
-  else ()
-    # General flags
-    #
-    # Note that some of the flags listed here really should be developer
-    # flags (listed in a separate variable, below) but we put them here
-    # because they are not raised by the current code and we'd like to
-    # know if they do start showing up.
-    #
-    # NOTE: Don't add -Wpadded here since we can't/won't fix the (many)
-    # warnings that are emitted. If you need it, add it at configure time.
-    if (CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
+if (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
+  list (APPEND HDF5_CMAKE_CXX_FLAGS "-erroff=%none -DBSD_COMP")
+else ()
+  # General flags
+  #
+  # Note that some of the flags listed here really should be developer
+  # flags (listed in a separate variable, below) but we put them here
+  # because they are not raised by the current code and we'd like to
+  # know if they do start showing up.
+  #
+  # NOTE: Don't add -Wpadded here since we can't/won't fix the (many)
+  # warnings that are emitted. If you need it, add it at configure time.
+  if (CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
+    if (_INTEL_WINDOWS)
+      ADD_H5_FLAGS (HDF5_CMAKE_CXX_FLAGS "${HDF5_SOURCE_DIR}/config/intel-warnings/win-general")
+    else ()
       ADD_H5_FLAGS (HDF5_CMAKE_CXX_FLAGS "${HDF5_SOURCE_DIR}/config/intel-warnings/general")
+    endif()
+    if (NOT _INTEL_WINDOWS)
       if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 15.0)
         ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/intel-warnings/15")
       endif()
       if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 18.0)
         ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/intel-warnings/18")
       endif()
-    elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-      if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_LOADED
-          AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 4.8)
-        # add the general CXX flags for g++ compiler versions 4.8 and above.
-        ADD_H5_FLAGS (HDF5_CMAKE_CXX_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-general")
-        if (HDF5_ENABLE_WARNINGS_AS_ERRORS)
-          ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-error-general")
-        else ()
-          ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-noerror-general")
-        endif ()
+    endif()
+  elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_LOADED
+        AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 4.8)
+      # add the general CXX flags for g++ compiler versions 4.8 and above.
+      ADD_H5_FLAGS (HDF5_CMAKE_CXX_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-general")
+      if (HDF5_ENABLE_WARNINGS_AS_ERRORS)
+        ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-error-general")
+      else ()
+        ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-noerror-general")
       endif ()
-    elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-      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")
-    endif ()
-    if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-      message (VERBOSE "CMAKE_CXX_FLAGS_GENERAL=${HDF5_CMAKE_CXX_FLAGS}")
     endif ()
+  elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+    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")
   endif ()
-
-  #-----------------------------------------------------------------------------
-  # Option to allow the user to enable developer warnings
-  # Developer warnings (suggestions from gcc, not code problems)
-  #-----------------------------------------------------------------------------
-  if (HDF5_ENABLE_DEV_WARNINGS)
-    message (STATUS "....HDF5 developer group warnings are enabled")
-    if (CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
-      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/intel-warnings/developer-general")
-    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")
-      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")
-      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/clang-warnings/no-developer-general")
-    endif ()
+  if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+    message (VERBOSE "CMAKE_CXX_FLAGS_GENERAL=${HDF5_CMAKE_CXX_FLAGS}")
   endif ()
+endif ()
 
+#-----------------------------------------------------------------------------
+# Option to allow the user to enable developer warnings
+# Developer warnings (suggestions from gcc, not code problems)
+#-----------------------------------------------------------------------------
+if (HDF5_ENABLE_DEV_WARNINGS)
+  message (STATUS "....HDF5 developer group warnings are enabled")
+  if (CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
+    ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/intel-warnings/developer-general")
+  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")
+    ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/clang-warnings/developer-general")
+  endif ()
+else ()
   if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-    # Technically, variable-length arrays are part of the C99 standard, but
-    #   we should approach them a bit cautiously... Only needed for gcc 4.X
-    if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0 AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 4.8)
-      # Use the C warnings as CXX warnings are the same
-      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/4.8-4.last")
-    endif ()
+    # 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")
+    ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/clang-warnings/no-developer-general")
+  endif ()
+endif ()
 
-    # Append more extra warning flags that only gcc 4.8+ knows about
-    if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
-      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-4.8")
-      if (HDF5_ENABLE_DEV_WARNINGS)
-        # Use the C warnings as CXX warnings are the same
-        ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-4.8")
-      else ()
-        ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-4.8")
-      endif ()
-    endif ()
+if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+  # Technically, variable-length arrays are part of the C99 standard, but
+  #   we should approach them a bit cautiously... Only needed for gcc 4.X
+  if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0 AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 4.8)
+    # Use the C warnings as CXX warnings are the same
+    ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/4.8-4.last")
+  endif ()
 
-    # Append more extra warning flags that only gcc 4.9+ knows about
-    if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9)
+  # Append more extra warning flags that only gcc 4.8+ knows about
+  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
+    ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-4.8")
+    if (HDF5_ENABLE_DEV_WARNINGS)
       # Use the C warnings as CXX warnings are the same
-      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-4.9")
+      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-4.8")
+    else ()
+      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-4.8")
     endif ()
+  endif ()
 
-    # Append more extra warning flags that only gcc 5.1+ knows about
-    if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
-      # autotools always add the C flags with the CXX flags
-      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-5")
-      if (HDF5_ENABLE_WARNINGS_AS_ERRORS)
-        ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-error-5")
-      else ()
-        ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-noerror-5")
-      endif ()
-    endif ()
+  # Append more extra warning flags that only gcc 4.9+ knows about
+  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9)
+    # Use the C warnings as CXX warnings are the same
+    ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-4.9")
+  endif ()
 
-    # Append more extra warning flags that only gcc 6.x+ knows about
-    if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0)
-      # Use the C warnings as CXX warnings are the same
-      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/6")
+  # Append more extra warning flags that only gcc 5.1+ knows about
+  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
+    # autotools always add the C flags with the CXX flags
+    ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-5")
+    if (HDF5_ENABLE_WARNINGS_AS_ERRORS)
+      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-error-5")
+    else ()
+      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-noerror-5")
     endif ()
+  endif ()
 
-    # Append more extra warning flags that only gcc 7.x+ knows about
-    if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0)
-      # Use the C warnings as CXX warnings are the same
-      ADD_H5_FLAGS (H5_CXxFLAGS2 "${HDF5_SOURCE_DIR}/config/gnu-warnings/7")
-      if (HDF5_ENABLE_DEV_WARNINGS)
-      # Use the C warnings as CXX warnings are the same
-        ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-7")
-      #else ()
-      #  ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-7")
-      endif ()
-    endif ()
+  # Append more extra warning flags that only gcc 6.x+ knows about
+  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0)
+    # Use the C warnings as CXX warnings are the same
+    ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/6")
+  endif ()
 
-    # Append more extra warning flags that only gcc 8.x+ knows about
-    if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8.0)
-      # Use the C warnings as CXX warnings are the same
-      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/8")
-      if (HDF5_ENABLE_WARNINGS_AS_ERRORS)
-        ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/error-8")
-      else ()
-        ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/noerror-8")
-      endif ()
-      if (HDF5_ENABLE_DEV_WARNINGS)
-        # Use the C warnings as CXX warnings are the same
-        ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-8")
-      else ()
-        # autotools always add the C flags with the CXX flags
-        ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-8")
-      endif ()
+  # Append more extra warning flags that only gcc 7.x+ knows about
+  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0)
+    # Use the C warnings as CXX warnings are the same
+    ADD_H5_FLAGS (H5_CXxFLAGS2 "${HDF5_SOURCE_DIR}/config/gnu-warnings/7")
+    if (HDF5_ENABLE_DEV_WARNINGS)
+    # Use the C warnings as CXX warnings are the same
+      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-7")
+    #else ()
+    #  ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-7")
     endif ()
+  endif ()
 
-    # Append more extra warning flags that only gcc 9.x+ knows about
-    if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0)
+  # Append more extra warning flags that only gcc 8.x+ knows about
+  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8.0)
+    # Use the C warnings as CXX warnings are the same
+    ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/8")
+    if (HDF5_ENABLE_WARNINGS_AS_ERRORS)
+      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/error-8")
+    else ()
+      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/noerror-8")
+    endif ()
+    if (HDF5_ENABLE_DEV_WARNINGS)
       # Use the C warnings as CXX warnings are the same
-      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-9")
+      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-8")
+    else ()
+      # autotools always add the C flags with the CXX flags
+      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-8")
     endif ()
+  endif ()
 
-    # Append more extra warning flags that only gcc 9.3+ knows about
-    if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.3)
-      # do not use C warnings, gnu-warnings 9.3, no cxx warniings
-      # ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/9.3")
-    endif ()
+  # Append more extra warning flags that only gcc 9.x+ knows about
+  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0)
+    # Use the C warnings as CXX warnings are the same
+    ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-9")
+  endif ()
 
-    # Append more extra warning flags that only gcc 10.x+ knows about
-    if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.0)
-      if (HDF5_ENABLE_DEV_WARNINGS)
-        # Use the C warnings as CXX warnings are the same
-        ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-10")
-      #else ()
-      #  ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-10")
-      endif ()
+  # Append more extra warning flags that only gcc 9.3+ knows about
+  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.3)
+    # do not use C warnings, gnu-warnings 9.3, no cxx warniings
+    # ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/9.3")
+  endif ()
+
+  # Append more extra warning flags that only gcc 10.x+ knows about
+  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.0)
+    if (HDF5_ENABLE_DEV_WARNINGS)
+      # Use the C warnings as CXX warnings are the same
+      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-10")
+    #else ()
+    #  ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-10")
     endif ()
   endif ()
 endif ()
@@ -270,7 +302,7 @@ endif ()
 #-----------------------------------------------------------------------------
 if (HDF5_ENABLE_SYMBOLS MATCHES "YES")
   if(CMAKE_CXX_COMPILER_LOADED)
-    if (CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
+    if (CMAKE_CXX_COMPILER_ID STREQUAL "Intel" AND NOT _INTEL_WINDOWS)
       set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g")
     elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
       set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g")
@@ -278,8 +310,8 @@ if (HDF5_ENABLE_SYMBOLS MATCHES "YES")
   endif ()
 elseif (HDF5_ENABLE_SYMBOLS MATCHES "NO")
   if(CMAKE_CXX_COMPILER_LOADED)
-    if (CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
-      set (CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -Wl,-s")
+    if (CMAKE_CXX_COMPILER_ID STREQUAL "Intel" AND NOT _INTEL_WINDOWS)
+      set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-s")
     elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
       set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s")
     endif ()
diff --git a/config/cmake/HDFCompilerFlags.cmake b/config/cmake/HDFCompilerFlags.cmake
index e38a92b..de5b563 100644
--- a/config/cmake/HDFCompilerFlags.cmake
+++ b/config/cmake/HDFCompilerFlags.cmake
@@ -14,14 +14,43 @@ set(CMAKE_C_STANDARD_REQUIRED TRUE)
 
 set (CMAKE_C_FLAGS "${CMAKE_C99_STANDARD_COMPILE_OPTION} ${CMAKE_C_FLAGS}")
 set (CMAKE_C_FLAGS "${CMAKE_C_SANITIZER_FLAGS} ${CMAKE_C_FLAGS}")
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_SANITIZER_FLAGS} ${CMAKE_CXX_FLAGS}")
-
 if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-  message (VERBOSE "Warnings Configuration: default: ${CMAKE_C_FLAGS} : ${CMAKE_CXX_FLAGS}")
+  message (VERBOSE "Warnings Configuration: C default: ${CMAKE_C_FLAGS}")
 endif ()
 #-----------------------------------------------------------------------------
 # Compiler specific flags : Shouldn't there be compiler tests for these
 #-----------------------------------------------------------------------------
+if(WIN32 AND CMAKE_C_COMPILER_ID STREQUAL "Intel")
+  set(_INTEL_WINDOWS 1)
+endif()
+
+if(WIN32 AND CMAKE_C_COMPILER_ID STREQUAL "Clang"
+   AND "x${CMAKE_C_SIMULATE_ID}" STREQUAL "xMSVC")
+  set(_CLANG_MSVC_WINDOWS 1)
+endif()
+
+# Disable deprecation warnings for standard C functions.
+# really only needed for newer versions of VS, but should
+# not hurt other versions, and this will work into the
+# future
+if(MSVC OR _INTEL_WINDOWS OR _CLANG_MSVC_WINDOWS)
+  add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)
+else()
+endif()
+
+if(MSVC)
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stack:10000000")
+endif()
+
+# MSVC 14.28 enables C5105, but the Windows SDK 10.0.18362.0 triggers it.
+if(CMAKE_C_COMPILER_ID STREQUAL "MSVC" AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 19.28)
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -wd5105")
+endif()
+
+if(_CLANG_MSVC_WINDOWS AND "x${CMAKE_C_COMPILER_FRONTEND_VARIANT}" STREQUAL "xGNU")
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Xlinker -stack:20000000")
+endif()
+
 if (CMAKE_COMPILER_IS_GNUCC)
   set (CMAKE_C_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_C_FLAGS}")
   if (${HDF_CFG_NAME} MATCHES "Debug")
@@ -81,33 +110,37 @@ endif ()
 # HDF5 library compile options
 #-----------------------------------------------------------------------------
 
-if (NOT MSVC AND NOT MINGW)
-  #-----------------------------------------------------------------------------
-  # Option to allow the user to interpret certain warnings as errors
-  #
-  # This should NOT be on by default as it can cause a lot of conflicts with
-  # new operating systems and compiler versions. Header files that are out of
-  # our control (MPI, HDFS, etc.) can also raise warnings.
-  #-----------------------------------------------------------------------------
-  option (HDF5_ENABLE_WARNINGS_AS_ERRORS "Interpret some warnings as errors" OFF)
-  if (HDF5_ENABLE_WARNINGS_AS_ERRORS)
-    message (STATUS "...some warnings will be interpreted as errors")
-  endif ()
+#-----------------------------------------------------------------------------
+# Option to allow the user to interpret certain warnings as errors
+#
+# This should NOT be on by default as it can cause a lot of conflicts with
+# new operating systems and compiler versions. Header files that are out of
+# our control (MPI, HDFS, etc.) can also raise warnings.
+#-----------------------------------------------------------------------------
+option (HDF5_ENABLE_WARNINGS_AS_ERRORS "Interpret some warnings as errors" OFF)
+if (HDF5_ENABLE_WARNINGS_AS_ERRORS)
+  message (STATUS "...some warnings will be interpreted as errors")
+endif ()
 
-  if (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
-    list (APPEND HDF5_CMAKE_C_FLAGS "-erroff=%none -DBSD_COMP")
-  else ()
-    # General flags
-    #
-    # Note that some of the flags listed here really should be developer
-    # flags (listed in a separate variable, below) but we put them here
-    # because they are not raised by the current code and we'd like to
-    # know if they do start showing up.
-    #
-    # NOTE: Don't add -Wpadded here since we can't/won't fix the (many)
-    # warnings that are emitted. If you need it, add it at configure time.
-    if (CMAKE_C_COMPILER_ID STREQUAL "Intel")
+if (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
+  list (APPEND HDF5_CMAKE_C_FLAGS "-erroff=%none -DBSD_COMP")
+else ()
+  # General flags
+  #
+  # Note that some of the flags listed here really should be developer
+  # flags (listed in a separate variable, below) but we put them here
+  # because they are not raised by the current code and we'd like to
+  # know if they do start showing up.
+  #
+  # NOTE: Don't add -Wpadded here since we can't/won't fix the (many)
+  # warnings that are emitted. If you need it, add it at configure time.
+  if (CMAKE_C_COMPILER_ID STREQUAL "Intel")
+    if (_INTEL_WINDOWS)
+      ADD_H5_FLAGS (HDF5_CMAKE_C_FLAGS "${HDF5_SOURCE_DIR}/config/intel-warnings/win-general")
+    else ()
       ADD_H5_FLAGS (HDF5_CMAKE_C_FLAGS "${HDF5_SOURCE_DIR}/config/intel-warnings/general")
+    endif()
+    if (NOT _INTEL_WINDOWS)
       if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 15.0)
         ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/intel-warnings/15")
       endif()
@@ -116,133 +149,137 @@ if (NOT MSVC AND NOT MINGW)
       if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 18.0)
         ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/intel-warnings/18")
       endif()
-    elseif (CMAKE_C_COMPILER_ID STREQUAL "GNU")
-      # Add general CFlags for GCC versions 4.8 and above
-      if (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 4.8)
-        ADD_H5_FLAGS (HDF5_CMAKE_C_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/general")
-        if (HDF5_ENABLE_WARNINGS_AS_ERRORS)
-          ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/error-general")
-        else ()
-          ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/noerror-general")
-        endif ()
-      endif ()
-      # gcc automatically inlines based on the optimization level
-      # this is just a failsafe
-      list (APPEND H5_CFLAGS "-finline-functions")
-    elseif (CMAKE_C_COMPILER_ID MATCHES "[Cc]lang")
-      ADD_H5_FLAGS (HDF5_CMAKE_C_FLAGS "${HDF5_SOURCE_DIR}/config/clang-warnings/general")
+    endif()
+  elseif (CMAKE_C_COMPILER_ID STREQUAL "GNU")
+    # Add general CFlags for GCC versions 4.8 and above
+    if (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 4.8)
+      ADD_H5_FLAGS (HDF5_CMAKE_C_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/general")
       if (HDF5_ENABLE_WARNINGS_AS_ERRORS)
-        ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/clang-warnings/error-general")
+        ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/error-general")
       else ()
-        ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/clang-warnings/noerror-general")
+        ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/noerror-general")
       endif ()
-    elseif (CMAKE_C_COMPILER_ID STREQUAL "PGI")
-      list (APPEND HDF5_CMAKE_C_FLAGS "-Minform=inform")
     endif ()
-    if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-      message (VERBOSE "CMAKE_C_FLAGS_GENERAL=${HDF5_CMAKE_C_FLAGS}")
+    # gcc automatically inlines based on the optimization level
+    # this is just a failsafe
+    list (APPEND H5_CFLAGS "-finline-functions")
+  elseif (CMAKE_C_COMPILER_ID MATCHES "[Cc]lang")
+    ADD_H5_FLAGS (HDF5_CMAKE_C_FLAGS "${HDF5_SOURCE_DIR}/config/clang-warnings/general")
+    if (HDF5_ENABLE_WARNINGS_AS_ERRORS)
+      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/clang-warnings/error-general")
+    else ()
+      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/clang-warnings/noerror-general")
     endif ()
+  elseif (CMAKE_C_COMPILER_ID STREQUAL "PGI")
+    list (APPEND HDF5_CMAKE_C_FLAGS "-Minform=inform")
   endif ()
+  if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+    message (VERBOSE "CMAKE_C_FLAGS_GENERAL=${HDF5_CMAKE_C_FLAGS}")
+  endif ()
+endif ()
 
-  #-----------------------------------------------------------------------------
-  # Option to allow the user to enable developer warnings
-  # Developer warnings (suggestions from gcc, not code problems)
-  #-----------------------------------------------------------------------------
-  option (HDF5_ENABLE_DEV_WARNINGS "Enable HDF5 developer group warnings" OFF)
-  if (HDF5_ENABLE_DEV_WARNINGS)
-    message (STATUS "....HDF5 developer group warnings are enabled")
-    if (CMAKE_C_COMPILER_ID STREQUAL "Intel")
+#-----------------------------------------------------------------------------
+# Option to allow the user to enable developer warnings
+# Developer warnings (suggestions from gcc, not code problems)
+#-----------------------------------------------------------------------------
+option (HDF5_ENABLE_DEV_WARNINGS "Enable HDF5 developer group warnings" OFF)
+if (HDF5_ENABLE_DEV_WARNINGS)
+  message (STATUS "....HDF5 developer group warnings are enabled")
+  if (CMAKE_C_COMPILER_ID STREQUAL "Intel")
+    if (_INTEL_WINDOWS)
+      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/intel-warnings/win-developer-general")
+    else ()
       ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/intel-warnings/developer-general")
-    elseif (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 4.8)
-      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-general")
-    elseif (CMAKE_C_COMPILER_ID MATCHES "[Cc]lang")
-      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/clang-warnings/developer-general")
-    endif ()
-  else ()
-    if (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 4.8)
-      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-general")
-    elseif (CMAKE_C_COMPILER_ID MATCHES "[Cc]lang")
-      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/clang-warnings/no-developer-general")
     endif ()
+  elseif (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 4.8)
+    ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-general")
+  elseif (CMAKE_C_COMPILER_ID MATCHES "[Cc]lang")
+    ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/clang-warnings/developer-general")
   endif ()
+else ()
+  if (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 4.8)
+    ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-general")
+  elseif (CMAKE_C_COMPILER_ID MATCHES "[Cc]lang")
+    ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/clang-warnings/no-developer-general")
+  endif ()
+endif ()
 
-  if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
-    # Technically, variable-length arrays are part of the C99 standard, but
-    #   we should approach them a bit cautiously... Only needed for gcc 4.X
-    if (CMAKE_C_COMPILER_VERSION VERSION_LESS 5.0 AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 4.8)
-      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/4.8-4.last")
-    endif ()
+if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
+  # Technically, variable-length arrays are part of the C99 standard, but
+  #   we should approach them a bit cautiously... Only needed for gcc 4.X
+  if (CMAKE_C_COMPILER_VERSION VERSION_LESS 5.0 AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 4.8)
+    ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/4.8-4.last")
+  endif ()
 
-    # Append more extra warning flags that only gcc 4.8+ knows about
-    if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.8)
-      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/4.8")
-      if (HDF5_ENABLE_DEV_WARNINGS)
-        ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-4.8")
-      else ()
-        ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-4.8")
-      endif ()
+  # Append more extra warning flags that only gcc 4.8+ knows about
+  if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.8)
+    ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/4.8")
+    if (HDF5_ENABLE_DEV_WARNINGS)
+      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-4.8")
+    else ()
+      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-4.8")
     endif ()
+  endif ()
 
-    # Append more extra warning flags that only gcc 4.9+ knows about
-    if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.9)
-      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/4.9")
-    endif ()
+  # Append more extra warning flags that only gcc 4.9+ knows about
+  if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.9)
+    ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/4.9")
+  endif ()
 
-    # Append more extra warning flags that only gcc 5.x+ knows about
-    if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 5.0)
-      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/5")
-      if (HDF5_ENABLE_WARNINGS_AS_ERRORS)
-        ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/error-5")
-      else ()
-        ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/error-5")
-      endif ()
+  # Append more extra warning flags that only gcc 5.x+ knows about
+  if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 5.0)
+    ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/5")
+    if (HDF5_ENABLE_WARNINGS_AS_ERRORS)
+      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/error-5")
+    else ()
+      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/error-5")
     endif ()
+  endif ()
 
-    # Append more extra warning flags that only gcc 6.x+ knows about
-    if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 6.0)
-      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/6")
-    endif ()
+  # Append more extra warning flags that only gcc 6.x+ knows about
+  if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 6.0)
+    ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/6")
+  endif ()
 
-    # Append more extra warning flags that only gcc 7.x+ knows about
-    if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 7.0)
-      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/7")
-      if (HDF5_ENABLE_DEV_WARNINGS)
-        ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-7")
-      #else ()
-      #  ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-7")
-      endif ()
+  # Append more extra warning flags that only gcc 7.x+ knows about
+  if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 7.0)
+    ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/7")
+    if (HDF5_ENABLE_DEV_WARNINGS)
+      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-7")
+    #else ()
+    #  ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-7")
     endif ()
+  endif ()
 
-    # Append more extra warning flags that only gcc 8.x+ knows about
-    if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 8.0)
-      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/8")
-      if (HDF5_ENABLE_WARNINGS_AS_ERRORS)
-        ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/error-8")
-      endif ()
-      if (HDF5_ENABLE_DEV_WARNINGS)
-        ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-8")
-      else ()
-        ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-8")
-      endif ()
+  # Append more extra warning flags that only gcc 8.x+ knows about
+  if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 8.0)
+    ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/8")
+    if (HDF5_ENABLE_WARNINGS_AS_ERRORS)
+      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/error-8")
     endif ()
-
-    # Append more extra warning flags that only gcc 9.x+ knows about
-    if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 9.0)
-      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/9")
+    if (HDF5_ENABLE_DEV_WARNINGS)
+      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-8")
+    else ()
+      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-8")
     endif ()
+  endif ()
 
-    # Append more extra warning flags that only gcc 9.3+ knows about
-    if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 9.3)
-      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/9.3")
-    endif ()
+  # Append more extra warning flags that only gcc 9.x+ knows about
+  if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 9.0)
+    ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/9")
+  endif ()
 
-    # Append more extra warning flags that only gcc 10.x+ knows about
-    if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 10.0)
-      if (HDF5_ENABLE_DEV_WARNINGS)
-        ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-10")
-      #else ()
-      #  ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-10")
-      endif ()
+  # Append more extra warning flags that only gcc 9.3+ knows about
+  if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 9.3)
+    ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/9.3")
+  endif ()
+
+  # Append more extra warning flags that only gcc 10.x+ knows about
+  if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 10.0)
+    if (HDF5_ENABLE_DEV_WARNINGS)
+      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-10")
+    #else ()
+    #  ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-10")
     endif ()
   endif ()
 endif ()
@@ -297,13 +334,13 @@ MARK_AS_ADVANCED (HDF5_ENABLE_ASSERTS)
 set (HDF5_ENABLE_SYMBOLS "OFF" CACHE STRING "Add debug symbols to the library independent of the build mode and optimization level (OFF NO YES)")
 set_property (CACHE HDF5_ENABLE_SYMBOLS PROPERTY STRINGS OFF NO YES)
 if (HDF5_ENABLE_SYMBOLS MATCHES "YES")
-  if (CMAKE_C_COMPILER_ID STREQUAL "Intel")
+  if (CMAKE_C_COMPILER_ID STREQUAL "Intel" AND NOT _INTEL_WINDOWS)
     set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g")
   elseif (CMAKE_C_COMPILER_ID STREQUAL "GNU")
     set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -fno-omit-frame-pointer")
   endif ()
 elseif (HDF5_ENABLE_SYMBOLS MATCHES "NO")
-  if (CMAKE_C_COMPILER_ID STREQUAL "Intel")
+  if (CMAKE_C_COMPILER_ID STREQUAL "Intel" AND NOT _INTEL_WINDOWS)
     set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wl,-s")
   elseif (CMAKE_C_COMPILER_ID STREQUAL "GNU")
     set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -s")