Flag construction must be after compiler detection

3 files changed, 342 insertions, 87 deletions

diff --git a/config/cmake/HDFCXXCompilerFlags.cmake b/config/cmake/HDFCXXCompilerFlags.cmake
new file mode 100644
index 0000000..504a171
--- /dev/null
+++ b/config/cmake/HDFCXXCompilerFlags.cmake
@@ -0,0 +1,324 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
+set(CMAKE_CXX_STANDARD 98)
+set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+macro (ADD_H5_FLAGS h5_flag_var infile)
+  file (STRINGS ${infile} TEST_FLAG_STREAM)
+  #message (STATUS "TEST_FLAG_STREAM=${TEST_FLAG_STREAM}")
+  list (LENGTH TEST_FLAG_STREAM len_flag)
+  if (len_flag GREATER 0)
+    math (EXPR _FP_LEN "${len_flag} - 1")
+    foreach (line RANGE 0 ${_FP_LEN})
+      list (GET TEST_FLAG_STREAM ${line} str_flag)
+      string (REGEX REPLACE "^#.*" "" str_flag "${str_flag}")
+      #message (STATUS "str_flag=${str_flag}")
+      if (str_flag)
+        list (APPEND ${h5_flag_var} "${str_flag}")
+      endif ()
+    endforeach ()
+  endif ()
+  #message (STATUS "h5_flag_var=${${h5_flag_var}}")
+endmacro ()
+
+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_SANITIZER_FLAGS} ${CMAKE_CXX_FLAGS}")
+message (STATUS "Warnings Configuration: CXX default:  ${CMAKE_CXX_FLAGS}")
+#-----------------------------------------------------------------------------
+# Compiler specific flags : Shouldn't there be compiler tests for these
+#-----------------------------------------------------------------------------
+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")
+    if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
+      set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Og -ftrapv -fno-common")
+    endif ()
+  else ()
+    if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
+      set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstdarg-opt")
+    endif ()
+  endif ()
+endif ()
+
+#-----------------------------------------------------------------------------
+# Option to allow the user to disable compiler warnings
+#-----------------------------------------------------------------------------
+if (HDF5_DISABLE_COMPILER_WARNINGS)
+  message (STATUS "....Compiler warnings are suppressed")
+  # MSVC uses /w to suppress warnings.  It also complains if another
+  # warning level is given, so remove it.
+  if (MSVC)
+    set (HDF5_WARNINGS_BLOCKED 1)
+    if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_LOADED)
+      string (REGEX REPLACE "(^| )([/-])W[0-9]( |$)" " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+      set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W0")
+    endif ()
+  endif ()
+  if (WIN32)
+    add_definitions (-D_CRT_SECURE_NO_WARNINGS)
+  endif ()
+
+  # Most compilers use -w to suppress warnings.
+  if (NOT HDF5_WARNINGS_BLOCKED)
+    if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_LOADED)
+      set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
+    endif ()
+  endif ()
+endif ()
+
+#-----------------------------------------------------------------------------
+# HDF5 library compile options
+#-----------------------------------------------------------------------------
+
+#-----------------------------------------------------------------------------
+# CDash is configured to only allow 3000 warnings, so
+# break into groups (from the config/gnu-flags file)
+#-----------------------------------------------------------------------------
+if (NOT MSVC)
+  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")
+      ADD_H5_FLAGS (HDF5_CMAKE_CXX_FLAGS "${HDF5_SOURCE_DIR}/config/intel-warnings-general")
+      if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 18.0)
+        list (APPEND H5_CXXFLAGS0 "-Wextra-tokens -Wformat -Wformat-security -Wic-pointer -Wshadow")
+        list (APPEND H5_CXXFLAGS0 "-Wsign-compare -Wtrigraphs -Wwrite-strings")
+      endif()
+    elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+      if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_LOADED)
+        ADD_H5_FLAGS (HDF5_CMAKE_CXX_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-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 ()
+    message (STATUS "CMAKE_CXX_FLAGS_GENERAL=${HDF5_CMAKE_CXX_FLAGS}")
+  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")
+    #    list (APPEND H5_CXXFLAGS0 "-Winline -Wreorder -Wport -Wstrict-aliasing")
+    #  elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    #    ADD_H5_FLAGS (H5_CXXFLAGS0 "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-general")
+    #  elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+    #    ADD_H5_FLAGS (H5_CXXFLAGS0 "${HDF5_SOURCE_DIR}/config/clang-warnings/developer-general")
+    #  endif ()
+    #else ()
+    #  if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    #    ADD_H5_FLAGS (H5_CXXFLAGS0 "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-general")
+    #  elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+    #    ADD_H5_FLAGS (H5_CXXFLAGS0 "${HDF5_SOURCE_DIR}/config/clang-warnings/no-developer-general")
+    #  endif ()
+    #endif ()
+
+
+    #if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    #  # Append warning flags that only gcc 4.3+ knows about
+    #  ADD_H5_FLAGS (H5_CXXFLAGS1 "${HDF5_SOURCE_DIR}/config/gnu-warnings/4.3")
+
+    #  # Append more extra warning flags that only gcc 4.4+ know about
+    #  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.4)
+    #    ADD_H5_FLAGS (H5_CXXFLAGS1 "${HDF5_SOURCE_DIR}/config/gnu-warnings/4.4")
+    #  endif ()
+    #endif ()
+
+    # Append more extra warning flags that only gcc 4.5+ know about
+    #if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.5)
+    #  ADD_H5_FLAGS (H5_CXXFLAGS1 "${HDF5_SOURCE_DIR}/config/gnu-warnings/4.5")
+    #  if (HDF5_ENABLE_DEV_WARNINGS)
+    #    ADD_H5_FLAGS (H5_CXXFLAGS1 "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-4.5")
+    #  else ()
+    #    ADD_H5_FLAGS (H5_CXXFLAGS1 "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-4.5")
+    #  endif ()
+    #endif ()
+endif ()
+
+#-----------------------------------------------------------------------------
+# Option to allow the user to enable all warnings
+#-----------------------------------------------------------------------------
+if (HDF5_ENABLE_ALL_WARNINGS)
+  message (STATUS "....All Warnings are enabled")
+  if (MSVC)
+    if (HDF5_ENABLE_DEV_WARNINGS)
+      if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_LOADED)
+        string (REGEX REPLACE "(^| )([/-])W[0-9]( |$)" " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+        list (APPEND HDF5_CMAKE_CXX_FLAGS "/Wall /wd4668")
+      endif ()
+    else ()
+      if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_LOADED)
+        string (REGEX REPLACE "(^| )([/-])W[0-9]( |$)" " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+        list (APPEND HDF5_CMAKE_CXX_FLAGS "/W3")
+      endif ()
+    endif ()
+  else ()
+    if (CMAKE_COMPILER_IS_GNUCC)
+      if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_LOADED)
+        list (APPEND HDF5_CMAKE_CXX_FLAGS ${H5_CXXFLAGS0} ${H5_CXXFLAGS1} ${H5_CXXFLAGS2} ${H5_CXXFLAGS3} ${H5_CXXFLAGS4})
+      endif ()
+    endif ()
+  endif ()
+endif ()
+
+#-----------------------------------------------------------------------------
+# Option to allow the user to enable warnings by groups
+#-----------------------------------------------------------------------------
+if (HDF5_ENABLE_GROUPZERO_WARNINGS)
+  message (STATUS "....Group Zero warnings are enabled")
+  if (MSVC)
+    if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_LOADED)
+      string (REGEX REPLACE "(^| )([/-])W[0-9]( |$)" " " HDF5_CMAKE_CXX_FLAGS "${HDF5_CMAKE_CXX_FLAGS}")
+      list (APPEND HDF5_CMAKE_CXX_FLAGS "/W1")
+    endif ()
+  else ()
+    if (CMAKE_COMPILER_IS_GNUCC)
+      if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_LOADED)
+        list (APPEND HDF5_CMAKE_CXX_FLAGS ${H5_CFLAGS0})
+      endif ()
+    endif ()
+  endif ()
+endif ()
+
+#-----------------------------------------------------------------------------
+# Option to allow the user to enable warnings by groups
+#-----------------------------------------------------------------------------
+if (HDF5_ENABLE_GROUPONE_WARNINGS)
+  message (STATUS "....Group One warnings are enabled")
+  if (MSVC)
+    if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_LOADED)
+      string (REGEX REPLACE "(^| )([/-])W[0-9]( |$)" " " HDF5_CMAKE_CXX_FLAGS "${HDF5_CMAKE_CXX_FLAGS}")
+      list (APPEND HDF5_CMAKE_CXX_FLAGS "/W2")
+    endif ()
+  else ()
+    if (CMAKE_COMPILER_IS_GNUCC)
+      if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_LOADED)
+        list (APPEND HDF5_CMAKE_CXX_FLAGS ${H5_CFLAGS1})
+      endif ()
+    endif ()
+  endif ()
+endif ()
+
+#-----------------------------------------------------------------------------
+# Option to allow the user to enable warnings by groups
+#-----------------------------------------------------------------------------
+if (HDF5_ENABLE_GROUPTWO_WARNINGS)
+  message (STATUS "....Group Two warnings are enabled")
+  if (MSVC)
+    if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_LOADED)
+      string (REGEX REPLACE "(^| )([/-])W[0-9]( |$)" " " HDF5_CMAKE_CXX_FLAGS "${HDF5_CMAKE_CXX_FLAGS}")
+      list (APPEND HDF5_CMAKE_CXX_FLAGS "/W3")
+    endif ()
+  else ()
+    if (CMAKE_COMPILER_IS_GNUCC)
+      if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_LOADED)
+        list (APPEND HDF5_CMAKE_CXX_FLAGS ${H5_CFLAGS2})
+      endif ()
+    endif ()
+  endif ()
+endif ()
+
+#-----------------------------------------------------------------------------
+# Option to allow the user to enable warnings by groups
+#-----------------------------------------------------------------------------
+if (HDF5_ENABLE_GROUPTHREE_WARNINGS)
+  message (STATUS "....Group Three warnings are enabled")
+  if (MSVC)
+    if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_LOADED)
+      string (REGEX REPLACE "(^| )([/-])W[0-9]( |$)" " " HDF5_CMAKE_CXX_FLAGS "${HDF5_CMAKE_CXX_FLAGS}")
+      list (APPEND HDF5_CMAKE_CXX_FLAGS "/W4")
+    endif ()
+  else ()
+    if (CMAKE_COMPILER_IS_GNUCC)
+      if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_LOADED)
+        list (APPEND HDF5_CMAKE_CXX_FLAGS ${H5_CFLAGS3})
+      endif ()
+    endif ()
+  endif ()
+endif ()
+
+#-----------------------------------------------------------------------------
+# Option to allow the user to enable warnings by groups
+#-----------------------------------------------------------------------------
+if (HDF5_ENABLE_GROUPFOUR_WARNINGS)
+  message (STATUS "....Group Four warnings are enabled")
+  if (NOT MSVC)
+    if (CMAKE_COMPILER_IS_GNUCC)
+      if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_LOADED)
+        list (APPEND HDF5_CMAKE_CXX_FLAGS ${H5_CFLAGS4})
+      endif ()
+    endif ()
+  endif ()
+endif ()
+
+#-----------------------------------------------------------------------------
+# This is in here to help some of the GCC based IDES like Eclipse
+# and code blocks parse the compiler errors and warnings better.
+#-----------------------------------------------------------------------------
+if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_LOADED)
+  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fmessage-length=0")
+endif ()
+
+#-----------------------------------------------------------------------------
+# Option for --enable-symbols
+# This option will force/override the default setting for all configurations
+#-----------------------------------------------------------------------------
+if (HDF5_ENABLE_SYMBOLS MATCHES "YES")
+  if(CMAKE_CXX_COMPILER_LOADED)
+    if (CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
+      set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g")
+    elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+      set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g")
+    endif ()
+  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")
+    elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+      set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s")
+    endif ()
+  endif ()
+endif ()
+
+#-----------------------------------------------------------------------------
+# Option for --enable-profiling
+# This option will force/override the default setting for all configurations
+#-----------------------------------------------------------------------------
+if (HDF5_ENABLE_PROFILING)
+  if(CMAKE_CXX_COMPILER_LOADED)
+    list (APPEND HDF5_CMAKE_CXX_FLAGS "${PROFILE_CXXFLAGS}")
+  endif ()
+endif ()
+
+#-----------------------------------------------------------------------------
+# Option for --enable-optimization
+# This option will force/override the default setting for all configurations
+#-----------------------------------------------------------------------------
+if (HDF5_ENABLE_OPTIMIZATION)
+  if(CMAKE_CXX_COMPILER_LOADED)
+    list (APPEND HDF5_CMAKE_CXX_FLAGS "${OPTIMIZE_CXXFLAGS}")
+  endif ()
+endif ()
diff --git a/config/cmake/HDFCompilerFlags.cmake b/config/cmake/HDFCompilerFlags.cmake
index 79e2bd2..1e5f775 100644
--- a/config/cmake/HDFCompilerFlags.cmake
+++ b/config/cmake/HDFCompilerFlags.cmake
@@ -133,9 +133,6 @@ if (NOT MSVC)
     elseif (CMAKE_C_COMPILER_ID STREQUAL "GNU")
       ADD_H5_FLAGS (HDF5_CMAKE_C_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/general")
       message (STATUS "CMAKE_C_FLAGS_GENERAL=${HDF5_CMAKE_C_FLAGS}")
-      if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_LOADED)
-        ADD_H5_FLAGS (HDF5_CMAKE_CXX_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-general")
-      endif ()
       ADD_H5_FLAGS (H5_CFLAGS0 "${HDF5_SOURCE_DIR}/config/gnu-warnings/error-general")
       # gcc automatically inlines based on the optimization level
       # this is just a failsafe
@@ -290,24 +287,13 @@ if (HDF5_ENABLE_ALL_WARNINGS)
     if (HDF5_ENABLE_DEV_WARNINGS)
       string (REGEX REPLACE "(^| )([/-])W[0-9]( |$)" " " CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
       list (APPEND HDF5_CMAKE_C_FLAGS "/Wall /wd4668")
-      if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_LOADED)
-        string (REGEX REPLACE "(^| )([/-])W[0-9]( |$)" " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-        list (APPEND HDF5_CMAKE_CXX_FLAGS "/Wall /wd4668")
-      endif ()
     else ()
       string (REGEX REPLACE "(^| )([/-])W[0-9]( |$)" " " CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
       list (APPEND HDF5_CMAKE_C_FLAGS "/W3")
-      if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_LOADED)
-        string (REGEX REPLACE "(^| )([/-])W[0-9]( |$)" " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-        list (APPEND HDF5_CMAKE_CXX_FLAGS "/W3")
-      endif ()
     endif ()
   else ()
     if (CMAKE_COMPILER_IS_GNUCC)
       list (APPEND HDF5_CMAKE_C_FLAGS ${H5_CFLAGS0} ${H5_CFLAGS1} ${H5_CFLAGS2} ${H5_CFLAGS3} ${H5_CFLAGS4})
-      if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_LOADED)
-        list (APPEND HDF5_CMAKE_CXX_FLAGS ${H5_CFLAGS0} ${H5_CFLAGS1} ${H5_CFLAGS2} ${H5_CFLAGS3} ${H5_CFLAGS4})
-      endif ()
     endif ()
   endif ()
 endif ()
@@ -321,16 +307,9 @@ if (HDF5_ENABLE_GROUPZERO_WARNINGS)
   if (MSVC)
     string (REGEX REPLACE "(^| )([/-])W[0-9]( |$)" " " HDF5_CMAKE_C_FLAGS "${HDF5_CMAKE_C_FLAGS}")
     list (APPEND HDF5_CMAKE_C_FLAGS "/W1")
-    if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_LOADED)
-      string (REGEX REPLACE "(^| )([/-])W[0-9]( |$)" " " HDF5_CMAKE_CXX_FLAGS "${HDF5_CMAKE_CXX_FLAGS}")
-      list (APPEND HDF5_CMAKE_CXX_FLAGS "/W1")
-    endif ()
   else ()
     if (CMAKE_COMPILER_IS_GNUCC)
       list (APPEND HDF5_CMAKE_C_FLAGS ${H5_CFLAGS0})
-      if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_LOADED)
-        list (APPEND HDF5_CMAKE_CXX_FLAGS ${H5_CFLAGS0})
-      endif ()
     endif ()
   endif ()
 endif ()
@@ -344,16 +323,9 @@ if (HDF5_ENABLE_GROUPONE_WARNINGS)
   if (MSVC)
     string (REGEX REPLACE "(^| )([/-])W[0-9]( |$)" " " HDF5_CMAKE_C_FLAGS "${HDF5_CMAKE_C_FLAGS}")
     list (APPEND HDF5_CMAKE_C_FLAGS "/W2")
-    if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_LOADED)
-      string (REGEX REPLACE "(^| )([/-])W[0-9]( |$)" " " HDF5_CMAKE_CXX_FLAGS "${HDF5_CMAKE_CXX_FLAGS}")
-      list (APPEND HDF5_CMAKE_CXX_FLAGS "/W2")
-    endif ()
   else ()
     if (CMAKE_COMPILER_IS_GNUCC)
       list (APPEND HDF5_CMAKE_C_FLAGS ${H5_CFLAGS1})
-      if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_LOADED)
-        list (APPEND HDF5_CMAKE_CXX_FLAGS ${H5_CFLAGS1})
-      endif ()
     endif ()
   endif ()
 endif ()
@@ -367,16 +339,9 @@ if (HDF5_ENABLE_GROUPTWO_WARNINGS)
   if (MSVC)
     string (REGEX REPLACE "(^| )([/-])W[0-9]( |$)" " " HDF5_CMAKE_C_FLAGS "${HDF5_CMAKE_C_FLAGS}")
     list (APPEND HDF5_CMAKE_C_FLAGS "/W3")
-    if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_LOADED)
-      string (REGEX REPLACE "(^| )([/-])W[0-9]( |$)" " " HDF5_CMAKE_CXX_FLAGS "${HDF5_CMAKE_CXX_FLAGS}")
-      list (APPEND HDF5_CMAKE_CXX_FLAGS "/W3")
-    endif ()
   else ()
     if (CMAKE_COMPILER_IS_GNUCC)
       list (APPEND HDF5_CMAKE_C_FLAGS ${H5_CFLAGS2})
-      if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_LOADED)
-        list (APPEND HDF5_CMAKE_CXX_FLAGS ${H5_CFLAGS2})
-      endif ()
     endif ()
   endif ()
 endif ()
@@ -390,16 +355,9 @@ if (HDF5_ENABLE_GROUPTHREE_WARNINGS)
   if (MSVC)
     string (REGEX REPLACE "(^| )([/-])W[0-9]( |$)" " " HDF5_CMAKE_C_FLAGS "${HDF5_CMAKE_C_FLAGS}")
     list (APPEND HDF5_CMAKE_C_FLAGS "/W4")
-    if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_LOADED)
-      string (REGEX REPLACE "(^| )([/-])W[0-9]( |$)" " " HDF5_CMAKE_CXX_FLAGS "${HDF5_CMAKE_CXX_FLAGS}")
-      list (APPEND HDF5_CMAKE_CXX_FLAGS "/W4")
-    endif ()
   else ()
     if (CMAKE_COMPILER_IS_GNUCC)
       list (APPEND HDF5_CMAKE_C_FLAGS ${H5_CFLAGS3})
-      if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_LOADED)
-        list (APPEND HDF5_CMAKE_CXX_FLAGS ${H5_CFLAGS3})
-      endif ()
     endif ()
   endif ()
 endif ()
@@ -413,9 +371,6 @@ if (HDF5_ENABLE_GROUPFOUR_WARNINGS)
   if (NOT MSVC)
     if (CMAKE_COMPILER_IS_GNUCC)
       list (APPEND HDF5_CMAKE_C_FLAGS ${H5_CFLAGS4})
-      if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_LOADED)
-        list (APPEND HDF5_CMAKE_CXX_FLAGS ${H5_CFLAGS4})
-      endif ()
     endif ()
   endif ()
 endif ()
@@ -427,9 +382,6 @@ endif ()
 if (CMAKE_COMPILER_IS_GNUCC)
   set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fmessage-length=0")
 endif ()
-if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_LOADED)
-  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fmessage-length=0")
-endif ()
 
 #-----------------------------------------------------------------------------
 # Option for --enable-asserts
@@ -459,26 +411,12 @@ if (HDF5_ENABLE_SYMBOLS MATCHES "YES")
   elseif (CMAKE_C_COMPILER_ID STREQUAL "GNU")
     set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -fno-omit-frame-pointer")
   endif ()
-  if(CMAKE_CXX_COMPILER_LOADED)
-    if (CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
-      set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g")
-    elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-      set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g")
-    endif ()
-  endif ()
 elseif (HDF5_ENABLE_SYMBOLS MATCHES "NO")
   if (CMAKE_C_COMPILER_ID STREQUAL "Intel")
     set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wl,-s")
   elseif (CMAKE_C_COMPILER_ID STREQUAL "GNU")
     set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -s")
   endif ()
-  if(CMAKE_CXX_COMPILER_LOADED)
-    if (CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
-      set (CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -Wl,-s")
-    elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-      set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s")
-    endif ()
-  endif ()
 endif ()
 MARK_AS_ADVANCED (HDF5_ENABLE_SYMBOLS)
 
@@ -489,9 +427,6 @@ MARK_AS_ADVANCED (HDF5_ENABLE_SYMBOLS)
 option (HDF5_ENABLE_PROFILING "Enable profiling flags independently from the build mode." OFF)
 if (HDF5_ENABLE_PROFILING)
   list (APPEND HDF5_CMAKE_C_FLAGS "${PROFILE_CFLAGS}")
-  if(CMAKE_CXX_COMPILER_LOADED)
-    list (APPEND HDF5_CMAKE_CXX_FLAGS "${PROFILE_CXXFLAGS}")
-  endif ()
 endif ()
 MARK_AS_ADVANCED (HDF5_ENABLE_PROFILING)
 
@@ -502,8 +437,5 @@ MARK_AS_ADVANCED (HDF5_ENABLE_PROFILING)
 option (HDF5_ENABLE_OPTIMIZATION "Enable optimization flags/settings independently from the build mode" OFF)
 if (HDF5_ENABLE_OPTIMIZATION)
   list (APPEND HDF5_CMAKE_C_FLAGS "${OPTIMIZE_CFLAGS}")
-  if(CMAKE_CXX_COMPILER_LOADED)
-    list (APPEND HDF5_CMAKE_CXX_FLAGS "${OPTIMIZE_CXXFLAGS}")
-  endif ()
 endif ()
 MARK_AS_ADVANCED (HDF5_ENABLE_OPTIMIZATION)
diff --git a/config/cmake/HDFFortranCompilerFlags.cmake b/config/cmake/HDFFortranCompilerFlags.cmake
index 8d59cd0..64afb2a 100644
--- a/config/cmake/HDFFortranCompilerFlags.cmake
+++ b/config/cmake/HDFFortranCompilerFlags.cmake
@@ -28,12 +28,11 @@ macro (ADD_H5_FFLAGS h5_fflag_var infile)
   #message (STATUS "h5_fflag_var=${${h5_fflag_var}}")
 endmacro ()
 
-message (STATUS "Warnings Configuration: default: ${CMAKE_Fortran_FLAGS}")
+message (STATUS "Warnings Configuration: default Fortran: ${CMAKE_Fortran_FLAGS}")
 
 #-----------------------------------------------------------------------------
 # Option to allow the user to disable compiler warnings
 #-----------------------------------------------------------------------------
-option (HDF5_DISABLE_COMPILER_WARNINGS "Disable compiler warnings" OFF)
 if (HDF5_DISABLE_COMPILER_WARNINGS)
   message (STATUS "....Compiler warnings are suppressed")
   # MSVC uses /w to suppress warnings.  It also complains if another
@@ -64,68 +63,68 @@ endif ()
 
 # General flags
 if (CMAKE_Fortran_COMPILER_ID STREQUAL "Intel")
-  ADD_H5_FLAGS (CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/intel-ifort-general")
-  list (APPEND CMAKE_Fortran_FLAGS "-stand f08 -free -implicitnone")
+  ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/intel-ifort-general")
+  list (APPEND HDF5_CMAKE_Fortran_FLAGS "-stand f08 -free -implicitnone")
 elseif (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
-  ADD_H5_FLAGS (CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-general")
-  list (APPEND CMAKE_Fortran_FLAGS "-ffree-form -std=f2008 -fimplicit-none")
+  ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-general")
+  list (APPEND HDF5_CMAKE_Fortran_FLAGS "-ffree-form -std=f2008 -fimplicit-none")
 elseif (CMAKE_Fortran_COMPILER_ID STREQUAL "PGI")
-  list (APPEND CMAKE_Fortran_FLAGS "-Mfreeform -Mdclchk -Mstandard -Mallocatable=03")
+  list (APPEND HDF5_CMAKE_Fortran_FLAGS "-Mfreeform -Mdclchk -Mstandard -Mallocatable=03")
 endif ()
-message (STATUS "CMAKE_Fortran_FLAGS=${CMAKE_Fortran_FLAGS}")
+message (STATUS "HDF5_CMAKE_Fortran_FLAGS=${HDF5_CMAKE_Fortran_FLAGS}")
 
 if (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
   # Append warning flags that only gcc 4.4+ knows about
-  ADD_H5_FLAGS (CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-4.4")
+  ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-4.4")
 endif ()
 
 # Append more extra warning flags that only gcc 4.5+ know about
 if (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 4.5)
-  ADD_H5_FLAGS (CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-4.5")
+  ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-4.5")
 endif ()
 
 # Append more extra warning flags that only gcc 4.6+ know about
 #if (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 4.6)
-#  ADD_H5_FLAGS (CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-4.6")
+#  ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-4.6")
 #endif ()
 
 # Append more extra warning flags that only gcc 4.7+ know about
 if (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 4.7)
-  ADD_H5_FLAGS (CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-4.7")
+  ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-4.7")
 endif ()
 
 # Append more extra warning flags that only gcc 4.8+ know about
 if (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 4.8)
-  ADD_H5_FLAGS (CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-4.8")
+  ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-4.8")
 endif ()
 
 # Append more extra warning flags that only gcc 4.9+ know about
 #if (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 4.9)
-#  ADD_H5_FLAGS (CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-4.9")
+#  ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-4.9")
 #endif ()
 
 # Append more extra warning flags that only gcc 5.1+ know about
 if (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 5.0)
-  ADD_H5_FLAGS (CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-5")
+  ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-5")
 endif ()
 
 # Append more extra warning flags that only gcc 6.x+ know about
 if (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 6.0)
-  ADD_H5_FLAGS (CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-6")
+  ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-6")
 endif ()
 
 # Append more extra warning flags that only gcc 7.x+ know about
 #if (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 7.0)
-#  ADD_H5_FLAGS (CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-7")
+#  ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-7")
 #endif ()
 
 # Append more extra warning flags that only gcc 8.x+ know about
 if (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 8.0)
-  ADD_H5_FLAGS (CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-8")
+  ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-8")
 endif ()
 
 # Append more extra warning flags that only gcc 9.x+ know about
 #if (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 9.0)
-#  ADD_H5_FLAGS (CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-9")
+#  ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-9")
 #endif ()