diff options
| author | mainzer <mainzer#hdfgroup.org> | 2021-11-22 21:11:48 (GMT) |
|---|---|---|
| committer | mainzer <mainzer#hdfgroup.org> | 2021-11-22 21:11:48 (GMT) |
| commit | 68c00b3fa1c0f4ba9b8e9724beb1d0b0b31f69ad (patch) | |
| tree | 0ac1b135f2c8a8bd9dbb980ebdbeb36dcf89f2c2 /config/cmake/HDFFortranCompilerFlags.cmake | |
| parent | 65d6d256cf9d04dbeb275025cc2b01d0f36ed3f1 (diff) | |
| parent | 2a5d2a27c492170f84d89b7725df4983fe6466a8 (diff) | |
| download | hdf5-68c00b3fa1c0f4ba9b8e9724beb1d0b0b31f69ad.zip hdf5-68c00b3fa1c0f4ba9b8e9724beb1d0b0b31f69ad.tar.gz hdf5-68c00b3fa1c0f4ba9b8e9724beb1d0b0b31f69ad.tar.bz2 | |
Merge remote-tracking branch 'origin/selection_io' into selection_io_with_subfiling_vfd
and resolved conflicts. Note that H5S_get_validated_dataspace() in H5S.c was removed.
Re-inserted this function for now.
Update testpar/t_subfiling_vfd.c to set HD_enable_selection_io_g. Uses MPI flag on
the sub-filing VFD is still not set, as the VFD seg faults if it is.
Tested parallel / debug on Charis and Jelly.
Diffstat (limited to 'config/cmake/HDFFortranCompilerFlags.cmake')
| -rw-r--r-- | config/cmake/HDFFortranCompilerFlags.cmake | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/config/cmake/HDFFortranCompilerFlags.cmake b/config/cmake/HDFFortranCompilerFlags.cmake index 8b631ad..94c40aa 100644 --- a/config/cmake/HDFFortranCompilerFlags.cmake +++ b/config/cmake/HDFFortranCompilerFlags.cmake @@ -80,37 +80,38 @@ if (NOT MSVC AND NOT MINGW) if (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU") - # Append more extra warning flags that only gcc 4.8+ know about + # 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") endif () - # Append more extra warning flags that only gcc 4.9+ know about + # Append more extra warning flags that only gcc 4.9+ knows about #if (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.x+ know 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 () + # 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 () - # Append more extra warning flags that only gcc 6.x+ know about + # Append more extra warning flags that only gcc 6.x+ knows about if (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 + # Append more extra warning flags that only gcc 7.x+ knows about #if (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 + # Append more extra warning flags that only gcc 8.x+ knows about if (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 + # Append more extra warning flags that only gcc 9.x+ knows about #if (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 () |