Hdf5 1 12 fix warnings files (#755)

* OESS-98 fix tools test for plugins

* sync fork

* Merge of changes from dev

* Move problem option to bottom of the list until fixed

* HDFFV-11106 - fix parsing optional args

* HDFFV-11106 add note

* grammer fix

* Whitespace after clang formatting

* Undo format version 11 changes

* Update check to working version

* Merge workflow and minor changes from develop

* Update supported platforms

* PR#3 merge from develop

* Merge gcc 10 diagnostics option from develop

* Merge #318 OSX changes from develop

* Merge serval small changes from dev

* fix typo

* Minor non-space formatting changes

* GH #386 copyright corrections for java folder

* revert because logic requires false return

* Merges from develop

#358 patches from vtk
#361 fix header guard spelling

* Remove case statement for H5I_EVENTSET

* Correct call with versioning

* Remove tabs

* Double underscore change

* Merges from develop

#340 clang -Wformat-security warnings
#360 Fixed uninitialized warnings
Remove more underscores from header guards

* Merge #380 from develop

* Correct date entry

* Split format source and commit changes on repo push

* remove pre-split setting

* Change windows TS to use older VS.

* HDFFV-11212 JNI export util and Javadoc

* Suggested review changes

* Another change found

* Committing clang-format changes

* Some Javadoc warning fixes

* Committing clang-format changes

* Updated javadoc fixes

* HDFFV-11228/9 merges from develop

* remove obsolete debug comment

* Fix conflict

* HDFFV-11229 merge changes from develop

* HDFFV-11229 merge second compare from develop

* HDFFV-11229 fix reference file

* HDFFV-11229 update autotools test script for two ref files

* HDFFV-11229 merge dev changes for long double display in tools

* Committing clang-format changes

* Update with changes from develop

* Add "option" command for clang options

* Rework CMake add_custom to use the BYPRODUCTS argument

Update pkgconfig scripts for parallel builds.
Fix install COPYING file reference.
Remove unused round defines.
Change CMake default setting of BUILD_CPP to off.

* Whitespace changes

* Rework CMake add_custom to use the BYPRODUCTS argument

* Revert CMake configure checks for round defines

* With VS 2015 minimum strdup is supported

* Doxygen comments merged from develop

* doxygen build updates

* Correct version string for map functions

* TRILAB-227 and tools debug merge from develop

* TRILAB-227 Enable test

* Quote subset args

* Use MATCHES in compiler id compare, merge from dev

* Revert test enable

* Add file to list

* doxygen version errors

* if blocks needed for build modes

* Update list of test platforms

* Issue #669 remove version from pkgcfg filename

* remove version from h5cc script

* Merge CMake and java refs from dev

* Reworked CMake Fortran configure macros to allow multiple runs.

* Fix CMake issue with tests not comparing test argument properly.

* MAX_PRECISION defines must be defined with a value

* Fix warnings files and -std

* remove std for c++11

* Replace file

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

1 files changed, 57 insertions, 21 deletions

diff --git a/config/intel-flags b/config/intel-flags
index 409ffe9..f46da0a 100644
--- a/config/intel-flags
+++ b/config/intel-flags
@@ -78,26 +78,43 @@ if test "X-icc" = "X-$cc_vendor"; then
     #        ;;
     #esac
 
-    # General
+    ###########
+    # General #
+    ###########
+
     # Default to C99 standard.
     H5_CFLAGS="$H5_CFLAGS $arch -std=c99"
 
-    # Production
+    ##############
+    # Production #
+    ##############
+
     PROD_CFLAGS=
 
-    # Debug
+    #########
+    # Debug #
+    #########
+
     # NDEBUG is handled explicitly in configure
     DEBUG_CFLAGS=
 
-    # Symbols
-    SYMBOLS_CFLAGS="-g"
+    ###########
+    # Symbols #
+    ###########
+
     NO_SYMBOLS_CFLAGS="-Wl,-s"
+    SYMBOLS_CFLAGS="-g"
+
+    #############
+    # Profiling #
+    #############
 
-    # Profiling
-    # Use this for profiling with gprof
     PROFILE_CFLAGS="-p"
 
-    # Optimization
+    ################
+    # Optimization #
+    ################
+
     HIGH_OPT_CFLAGS="-O3"
     DEBUG_OPT_CFLAGS="-O0"
     NO_OPT_CFLAGS="-O0"
@@ -110,32 +127,51 @@ if test "X-icc" = "X-$cc_vendor"; then
     # General #
     ###########
 
+    # Add various general warning flags in intel-warnings.
     H5_CFLAGS="$H5_CFLAGS $(load_intel_arguments general)"
 
+    ######################
+    # Developer warnings #
+    ######################
+
+    #NO_DEVELOPER_WARNING_CFLAGS=$(load_intel_arguments no-developer-general)
+    #DEVELOPER_WARNING_CFLAGS=$(load_intel_arguments developer-general)
+
     #############################
     # Version-specific warnings #
     #############################
 
-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"
-        ;;
-    icc-10*)
-        HIGH_OPT_CFLAGS="-O1"
-        ;;
-    icc-8.0*)
+    # intel == 8.0
+    if test $cc_vers_major -eq 8 -a $cc_vers_minor -eq 0; then
         # v8.0 -O3 infinite loops when compiling test/tselect.c. Use -O2.
         HIGH_OPT_CFLAGS="-O2"
-        ;;
-    icc-*)
-        ;;
-esac
+    fi
+
+    # intel == 10
+    if test $cc_vers_major -eq 10; then
+        HIGH_OPT_CFLAGS="-O1"
+    fi
+
+    # intel >= 15
+    if test $cc_vers_major -ge 15; then
+        H5_CFLAGS="$H5_CFLAGS $(load_intel_arguments 15)"
+    fi
+
+    # intel >= 18
+    if test $cc_vers_major -ge 18; then
+        H5_CFLAGS="$H5_CFLAGS $(load_intel_arguments 18)"
+    fi
+
+    # intel <= 19
+    # this file has warnings only available before oneapi versions
+    if test $cc_vers_major -le 19; then
+        H5_CFLAGS="$H5_CFLAGS $(load_intel_arguments general-19)"
+    fi
 
     #################
     # Flags are set #
     #################
     cc_flags_set=yes
-
 fi
 
 # Clear cc info if no flags set