Move intel warnings to subfolder, update autotools files

9 files changed, 118 insertions, 100 deletions

diff --git a/MANIFEST b/MANIFEST
index 70e61ed..b1be241 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -190,8 +190,8 @@
 ./config/gnu-warnings/no-developer-4.8
 ./config/gnu-warnings/no-developer-8
 ./config/gnu-warnings/no-developer-general
-./config/intel-ifort-general
-./config/intel-warnings-general
+./config/intel-warnings/ifort-general
+./config/intel-warnings/general
 
 ./config/site-specific/BlankForm
 
diff --git a/config/cmake/HDFCompilerFlags.cmake b/config/HDFCompilerFlags.cmake
index 1e5f775..b255e22 100644
--- a/config/cmake/HDFCompilerFlags.cmake
+++ b/config/HDFCompilerFlags.cmake
@@ -49,18 +49,6 @@ if (CMAKE_COMPILER_IS_GNUCC)
     endif ()
   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")
-    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
@@ -74,10 +62,6 @@ if (HDF5_DISABLE_COMPILER_WARNINGS)
     set (HDF5_WARNINGS_BLOCKED 1)
     string (REGEX REPLACE "(^| )([/-])W[0-9]( |$)" " " CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
     set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W0")
-    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)
@@ -91,9 +75,6 @@ if (HDF5_DISABLE_COMPILER_WARNINGS)
   # Most compilers use -w to suppress warnings.
   if (NOT HDF5_WARNINGS_BLOCKED)
     set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w")
-    if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_LOADED)
-      set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
-    endif ()
   endif ()
 endif ()
 
@@ -119,8 +100,7 @@ if (NOT MSVC)
     # 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")
-      ADD_H5_FLAGS (HDF5_CMAKE_C_FLAGS "${HDF5_SOURCE_DIR}/config/intel-warnings-general")
-      message (STATUS "CMAKE_C_FLAGS_GENERAL=${HDF5_CMAKE_C_FLAGS}")
+      ADD_H5_FLAGS (HDF5_CMAKE_C_FLAGS "${HDF5_SOURCE_DIR}/config/intel-warnings/general")
       list (APPEND H5_CFLAGS0 "-Wcomment -Wdeprecated -Wmain -Wmissing-declarations -Wmissing-prototypes -Wp64 -Wpointer-arith")
       list (APPEND H5_CFLAGS0 "-Wreturn-type -Wstrict-prototypes -Wuninitialized")
       list (APPEND H5_CFLAGS0 "-Wunknown-pragmas -Wunused-function -Wunused-variable")
@@ -132,18 +112,17 @@ if (NOT MSVC)
       endif()
     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}")
       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
       list (APPEND H5_CFLAGS0 "-finline-functions")
     elseif (CMAKE_C_COMPILER_ID STREQUAL "Clang")
       ADD_H5_FLAGS (HDF5_CMAKE_C_FLAGS "${HDF5_SOURCE_DIR}/config/clang-warnings/general")
-      message (STATUS "CMAKE_C_FLAGS_GENERAL=${HDF5_CMAKE_C_FLAGS}")
       ADD_H5_FLAGS (H5_CFLAGS0 "${HDF5_SOURCE_DIR}/config/clang-warnings/error-general")
     elseif (CMAKE_C_COMPILER_ID STREQUAL "PGI")
       list (APPEND HDF5_CMAKE_C_FLAGS "-Minform=inform")
     endif ()
+    message (STATUS "CMAKE_C_FLAGS_GENERAL=${HDF5_CMAKE_C_FLAGS}")
   endif ()
 
     #-----------------------------------------------------------------------------
diff --git a/config/cmake/HDFCXXCompilerFlags.cmake b/config/cmake/HDFCXXCompilerFlags.cmake
index 504a171..d828c10 100644
--- a/config/cmake/HDFCXXCompilerFlags.cmake
+++ b/config/cmake/HDFCXXCompilerFlags.cmake
@@ -97,7 +97,7 @@ if (NOT MSVC)
     # 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")
+      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")
diff --git a/config/cmake/HDFFortranCompilerFlags.cmake b/config/cmake/HDFFortranCompilerFlags.cmake
index 6b14dbd..4d63c95 100644
--- a/config/cmake/HDFFortranCompilerFlags.cmake
+++ b/config/cmake/HDFFortranCompilerFlags.cmake
@@ -39,8 +39,9 @@ if (HDF5_DISABLE_COMPILER_WARNINGS)
   # warning level is given, so remove it.
   if (MSVC)
     set (HDF5_WARNINGS_BLOCKED 1)
-    string (REGEX REPLACE "(^| )([/-])W[0-9]( |$)" " " CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS}")
-    set (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} /W0")
+    if (CMAKE_Fortran_COMPILER_ID STREQUAL "Intel")
+      set (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} /warn:none")
+    endif ()
   endif ()
   if (WIN32)
     add_definitions (-D_CRT_SECURE_NO_WARNINGS)
@@ -61,70 +62,80 @@ endif ()
 # HDF5 library compile options
 #-----------------------------------------------------------------------------
 
-# General flags
-if (CMAKE_Fortran_COMPILER_ID STREQUAL "Intel")
-  ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/intel-ifort-general")
-  list (APPEND HDF5_CMAKE_Fortran_FLAGS "-stand" "-free")
-elseif (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
-  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 HDF5_CMAKE_Fortran_FLAGS "-Mfreeform" "-Mdclchk" "-Mstandard" "-Mallocatable=03")
-endif ()
-message (STATUS "HDF5_CMAKE_Fortran_FLAGS=${HDF5_CMAKE_Fortran_FLAGS}")
+#-----------------------------------------------------------------------------
+# CDash is configured to only allow 3000 warnings, so
+# break into groups (from the config/gnu-flags file)
+#-----------------------------------------------------------------------------
+if (NOT MSVC)
+  # General flags
+  if (CMAKE_Fortran_COMPILER_ID STREQUAL "Intel")
+    ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/intel-warnings/ifort-general")
+    list (APPEND HDF5_CMAKE_Fortran_FLAGS "-stand:f08" "-free")
+  elseif (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
+    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 HDF5_CMAKE_Fortran_FLAGS "-Mfreeform" "-Mdclchk" "-Mstandard" "-Mallocatable=03")
+  endif ()
+  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 (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-4.4")
-endif ()
+  if (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
+    # Append warning flags that only gcc 4.4+ knows about
+    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 (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-4.5")
-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 (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 (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-4.6")
-#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 (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 (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-4.7")
-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 (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 (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-4.8")
-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 (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 (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-4.9")
-#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 (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 (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-5")
-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 (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 (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-6")
-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 (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 (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-7")
-#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 (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 (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-8")
-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 (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 (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-9")
-#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 (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-9")
+  #endif ()
+else ()
+  if (CMAKE_Fortran_COMPILER_ID STREQUAL "Intel")
+    #ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/intel-warnings/win-ifort-general")
+    list (APPEND HDF5_CMAKE_Fortran_FLAGS "/warn:all" "/stand:f08" "/free")
+endif ()
 
diff --git a/config/intel-fflags b/config/intel-fflags
index 8b1110e..c620ef7 100644
--- a/config/intel-fflags
+++ b/config/intel-fflags
@@ -1,4 +1,4 @@
-#							-*- shell-script -*-
+#                            -*- shell-script -*-
 #
 # Copyright by The HDF Group.
 # Copyright by the Board of Trustees of the University of Illinois.
@@ -17,6 +17,20 @@
 # if the compiler is not Intel; otherwise `f9x_flags_set' is set to `yes'
 #
 
+#
+# Prepend `$srcdir/config/intel-warnings/` to the filename suffix(es) given as
+# subroutine argument(s), remove comments starting with # and ending
+# at EOL, replace spans of whitespace (including newlines) with spaces,
+# and re-emit the file(s) thus filtered on the standard output stream.
+#
+load_intel_arguments()
+{
+    set -- $(for arg; do
+        sed 's,#.*$,,' $srcdir/config/intel-warnings/${arg}
+    done)
+    IFS=' ' echo "$*"
+}
+
 # Get the compiler version in a way that works for ifort
 # ifort unless a compiler version is already known
 #
@@ -44,8 +58,8 @@ fi
 
 # Common Intel flags for various situations
 if test "X-ifort" = "X-$f9x_vendor"; then
-    # Insert section about version specific problems from gnu-flags here, if
-    # necessary.
+    # Insert section about version specific problems from compiler flags here,
+    # if necessary.
 
     arch=
     # Architecture-specific flags
@@ -68,7 +82,7 @@ if test "X-ifort" = "X-$f9x_vendor"; then
     FC_BASENAME=ifort
     F9XSUFFIXFLAG=""
     FSEARCH_DIRS=""
-    H5_FCFLAGS="$H5_FCFLAGS"
+    H5_FCFLAGS="$H5_FCFLAGS $(load_intel_arguments ifort-general)"
 
     # Production
     PROD_FCFLAGS=
@@ -89,7 +103,9 @@ if test "X-ifort" = "X-$f9x_vendor"; then
     DEBUG_OPT_FCFLAGS=
     NO_OPT_FCFLAGS=
 
-    # Flags are set
+    #################
+    # Flags are set #
+    #################
     f9x_flags_set=yes
 fi
 
diff --git a/config/intel-flags b/config/intel-flags
index 6b4e406..100e68a 100644
--- a/config/intel-flags
+++ b/config/intel-flags
@@ -18,7 +18,7 @@
 #
 
 #
-# Prepend `$srcdir/config/intel-` to the filename suffix(es) given as
+# Prepend `$srcdir/config/intel-warnings/` to the filename suffix(es) given as
 # subroutine argument(s), remove comments starting with # and ending
 # at EOL, replace spans of whitespace (including newlines) with spaces,
 # and re-emit the file(s) thus filtered on the standard output stream.
@@ -26,7 +26,7 @@
 load_intel_arguments()
 {
     set -- $(for arg; do
-        sed 's,#.*$,,' $srcdir/config/intel-${arg}
+        sed 's,#.*$,,' $srcdir/config/intel-warnings/${arg}
     done)
     IFS=' ' echo "$*"
 }
@@ -81,7 +81,6 @@ if test "X-icc" = "X-$cc_vendor"; then
     # General
     # Default to C99 standard.
     H5_CFLAGS="$H5_CFLAGS $arch -std=c99"
-    H5_CFLAGS="$H5_CFLAGS $(load_intel_arguments warnings-general)"
 
     # Production
     PROD_CFLAGS=
@@ -103,16 +102,20 @@ if test "X-icc" = "X-$cc_vendor"; then
     DEBUG_OPT_CFLAGS="-O0"
     NO_OPT_CFLAGS="-O0"
 
-    # Flags are set
-    cc_flags_set=yes
+    ############
+    # Warnings #
+    ############
 
-fi
+    ###########
+    # General #
+    ###########
+
+    H5_CFLAGS="$H5_CFLAGS $(load_intel_arguments general)"
+
+    #############################
+    # Version-specific warnings #
+    #############################
 
-# Version specific ICC flags
-#
-# Please follow the pattern below by adding new versions at the top, copying
-# the information from the previous version and adding modifications to that.
-# The default at the bottom will apply if no earlier version matches.
 case "$cc_vendor-$cc_version" in
     icc-1[5-6]*)
         H5_CFLAGS="$H5_CFLAGS -Wcomment -Wdeprecated -Wextra-tokens -Wformat -Wformat-security -Wmain -Wmissing-declarations -Wmissing-prototypes -Wp64 -Wpointer-arith -Wreturn-type -Wshadow -Wstrict-prototypes -Wtrigraphs -Wuninitialized -Wunknown-pragmas -Wunused-function -Wunused-variable -Wwrite-strings"
@@ -128,6 +131,13 @@ case "$cc_vendor-$cc_version" in
         ;;
 esac
 
+    #################
+    # Flags are set #
+    #################
+    cc_flags_set=yes
+
+fi
+
 # Clear cc info if no flags set
 if test "X-$cc_flags_set" = "X-"; then
     cc_vendor=
diff --git a/config/intel-warnings-general b/config/intel-warnings/general
index d0b2e25..d0b2e25 100644
--- a/config/intel-warnings-general
+++ b/config/intel-warnings/general
diff --git a/config/intel-ifort-general b/config/intel-warnings/ifort-general
index a9da0e5..a9da0e5 100644
--- a/config/intel-ifort-general
+++ b/config/intel-warnings/ifort-general
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index a857afb..1f1ad60 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -57,11 +57,13 @@ New Features
 
     - Both build systems use same set of warnings flags
 
-      GNU C, C++ and gfortran warnings flags were moved to files in a confi
+      GNU C, C++ and gfortran warnings flags were moved to files in a config
       sub-folder named gnu-warnings. Flags that only are available for a specific
       version of the compiler are in files named with that version.
       Clang C warnings flags were moved to files in a config sub-folder
       named clang-warnings.
+      Intel C, Fortran warnings flags were moved to files in a config sub-folder
+      named intel-warnings.
 
       There are flags in named "error-xxx" files with warnings that may
       be promoted to errors. Some source files may still need fixes.