diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2022-03-26 19:47:53 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-26 19:47:53 (GMT) |
| commit | d4f151fac40724b0425e697b1c3613b5d86cfa7b (patch) | |
| tree | 5cdec1d6910851a762f84c10bfe14946fb7b975f | |
| parent | 5f0fc0396645311b304f51a2f7e8b654e1eea920 (diff) | |
| download | hdf5-d4f151fac40724b0425e697b1c3613b5d86cfa7b.zip hdf5-d4f151fac40724b0425e697b1c3613b5d86cfa7b.tar.gz hdf5-d4f151fac40724b0425e697b1c3613b5d86cfa7b.tar.bz2 | |
Windows and *nix use different forms for warnings #1515 (#1525)
| -rw-r--r-- | MANIFEST | 3 | ||||
| -rw-r--r-- | config/cmake/HDFFortranCompilerFlags.cmake | 6 | ||||
| -rw-r--r-- | config/intel-warnings/ifort-general | 2 | ||||
| -rw-r--r-- | config/intel-warnings/win-ifort-general | 1 |
4 files changed, 7 insertions, 5 deletions
@@ -199,9 +199,10 @@ ./config/intel-warnings/18 ./config/intel-warnings/developer-general ./config/intel-warnings/general +./config/intel-warnings/ifort-general ./config/intel-warnings/win-developer-general ./config/intel-warnings/win-general -./config/intel-warnings/ifort-general +./config/intel-warnings/win-ifort-general ./config/site-specific/BlankForm diff --git a/config/cmake/HDFFortranCompilerFlags.cmake b/config/cmake/HDFFortranCompilerFlags.cmake index 754259e..84b3ebe 100644 --- a/config/cmake/HDFFortranCompilerFlags.cmake +++ b/config/cmake/HDFFortranCompilerFlags.cmake @@ -62,7 +62,7 @@ if (NOT MSVC AND NOT MINGW) # 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:f03" "-free") + list (APPEND HDF5_CMAKE_Fortran_FLAGS "-stand f03" "-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" "-fimplicit-none") @@ -118,8 +118,8 @@ if (NOT MSVC AND NOT MINGW) 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:f03" "/free") + ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/intel-warnings/win-ifort-general") + list (APPEND HDF5_CMAKE_Fortran_FLAGS "/stand:f03" "/free") endif () endif () diff --git a/config/intel-warnings/ifort-general b/config/intel-warnings/ifort-general index a9da0e5..1644c7c 100644 --- a/config/intel-warnings/ifort-general +++ b/config/intel-warnings/ifort-general @@ -1 +1 @@ --warn:all +-warn all diff --git a/config/intel-warnings/win-ifort-general b/config/intel-warnings/win-ifort-general new file mode 100644 index 0000000..a335959 --- /dev/null +++ b/config/intel-warnings/win-ifort-general @@ -0,0 +1 @@ +/warn:all |