diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2021-10-31 04:01:29 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-31 04:01:29 (GMT) |
| commit | d8871dbf2756c1c1804b7611c805e3e21ac251d7 (patch) | |
| tree | ee7d840c9687db33164673c5b5883b74de0e164d | |
| parent | c910630c15ae3e8d019627a2f7ca4fc3cb0a7d43 (diff) | |
| download | hdf5-d8871dbf2756c1c1804b7611c805e3e21ac251d7.zip hdf5-d8871dbf2756c1c1804b7611c805e3e21ac251d7.tar.gz hdf5-d8871dbf2756c1c1804b7611c805e3e21ac251d7.tar.bz2 | |
Merge Github #1019 - add Fortran developer flags #1090 (#1147)
| -rw-r--r-- | MANIFEST | 2 | ||||
| -rw-r--r-- | config/cmake/HDFFortranCompilerFlags.cmake | 10 | ||||
| -rw-r--r-- | config/gnu-fflags | 8 | ||||
| -rw-r--r-- | config/gnu-warnings/developer-gfort-5 (renamed from config/gnu-warnings/gfort-5) | 0 | ||||
| -rw-r--r-- | configure.ac | 1 |
5 files changed, 11 insertions, 10 deletions
@@ -188,7 +188,7 @@ ./config/gnu-warnings/general ./config/gnu-warnings/gfort-general ./config/gnu-warnings/gfort-4.8 -./config/gnu-warnings/gfort-5 +./config/gnu-warnings/developer-gfort-5 ./config/gnu-warnings/gfort-6 ./config/gnu-warnings/gfort-8 ./config/gnu-warnings/no-cxx-developer-4.8 diff --git a/config/cmake/HDFFortranCompilerFlags.cmake b/config/cmake/HDFFortranCompilerFlags.cmake index 94c40aa..754259e 100644 --- a/config/cmake/HDFFortranCompilerFlags.cmake +++ b/config/cmake/HDFFortranCompilerFlags.cmake @@ -79,7 +79,6 @@ if (NOT MSVC AND NOT MINGW) endif () if (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU") - # Append more extra warning flags that only gcc 4.8+ knows about if (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") @@ -91,10 +90,11 @@ if (NOT MSVC AND NOT MINGW) #endif () # Append more extra warning flags that only gcc 5.x+ knows about - # 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 () + if (NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 5.0) + if (HDF5_ENABLE_DEV_WARNINGS) + ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-gfort-5") + endif () + 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 ce12561..1333ce5 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 (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 >= 5 + if test $f9x_vers_major -ge 5; then + DEVELOPER_WARNING_FCFLAGS="$DEVELOPER_WARNING_FCFLAGS $(load_gnu_arguments developer-gfort-5)" + fi # gfortran >= 6 if test $f9x_vers_major -ge 6; then diff --git a/config/gnu-warnings/gfort-5 b/config/gnu-warnings/developer-gfort-5 index c5d3850..c5d3850 100644 --- a/config/gnu-warnings/gfort-5 +++ b/config/gnu-warnings/developer-gfort-5 diff --git a/configure.ac b/configure.ac index 5666013..978c165 100644 --- a/configure.ac +++ b/configure.ac @@ -2449,6 +2449,7 @@ fi case "X-$DEV_WARNINGS" in X-yes) H5_CFLAGS="$H5_CFLAGS $DEVELOPER_WARNING_CFLAGS" + H5_FCFLAGS="$H5_FCFLAGS $DEVELOPER_WARNING_FCFLAGS" AC_MSG_RESULT([yes]) ;; X-no) |