summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <50328838+byrnHDF@users.noreply.github.com>2021-09-17 16:01:12 (GMT)
committerGitHub <noreply@github.com>2021-09-17 16:01:12 (GMT)
commit7afad40071d918d15983c993e933e2d99f24503d (patch)
treee5a121e4ba240c7bfdab7ea12b354c1b167cf6f5
parent3186b8227cf4ab785e8796397d0ef916c975c559 (diff)
downloadhdf5-7afad40071d918d15983c993e933e2d99f24503d.zip
hdf5-7afad40071d918d15983c993e933e2d99f24503d.tar.gz
hdf5-7afad40071d918d15983c993e933e2d99f24503d.tar.bz2
Merge Disable fortran warning #1014 (#1015)
-rw-r--r--config/cmake/HDFFortranCompilerFlags.cmake7
-rw-r--r--config/gnu-fflags8
2 files changed, 8 insertions, 7 deletions
diff --git a/config/cmake/HDFFortranCompilerFlags.cmake b/config/cmake/HDFFortranCompilerFlags.cmake
index 18ab621..94c40aa 100644
--- a/config/cmake/HDFFortranCompilerFlags.cmake
+++ b/config/cmake/HDFFortranCompilerFlags.cmake
@@ -91,9 +91,10 @@ if (NOT MSVC AND NOT MINGW)
#endif ()
# Append more extra warning flags that only gcc 5.x+ knows about
- if (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 ()
+ # do not include -Wuse-without-only
+ #if (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+ knows about
if (NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 6.0)
diff --git a/config/gnu-fflags b/config/gnu-fflags
index ec4fcab..ce12561 100644
--- a/config/gnu-fflags
+++ b/config/gnu-fflags
@@ -161,10 +161,10 @@ if test "X-gfortran" = "X-$f9x_vendor"; then
# gfortran 4.9 (nothing new)
- # gfortran >= 5
- if test $f9x_vers_major -ge 5; then
- H5_FCFLAGS="$H5_FCFLAGS $(load_gnu_arguments gfort-5)"
- fi
+ # gfortran >= 5 (do not include -Wuse-without-only)
+ #if test $f9x_vers_major -ge 5; then
+ # H5_FCFLAGS="$H5_FCFLAGS $(load_gnu_arguments gfort-5)"
+ #fi
# gfortran >= 6
if test $f9x_vers_major -ge 6; then