diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2019-07-29 21:24:15 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2019-07-29 21:24:15 (GMT) |
| commit | 4df595c22da9c316b44a46602091fd5fe261abe9 (patch) | |
| tree | 12c3d4c44f41cf3b18764a708baab2fed93fabb8 /hl | |
| parent | 517cadac2647bf325720c74285381045fb84be30 (diff) | |
| parent | d169391529f253a9903b8e6cacf38c59ceefab07 (diff) | |
| download | hdf5-4df595c22da9c316b44a46602091fd5fe261abe9.zip hdf5-4df595c22da9c316b44a46602091fd5fe261abe9.tar.gz hdf5-4df595c22da9c316b44a46602091fd5fe261abe9.tar.bz2 | |
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit 'd169391529f253a9903b8e6cacf38c59ceefab07':
Parallel Fortran tests now use the MPI module instead of including mpif.h.
First stab at gfortran versions. Tested on gfortran 7-9 so far.
Moved the -std=f2008 option to gfortran 9 for now.
Updated gfortran options. * Removed conclude_fc.am, which was causing verbose builds. Need to investigate more, though. * Added gfortran 9 warnings and flags. This will need to be separated into other version blocks based on when the options first appeared. * The standard is now explicitly set at 2008.
Diffstat (limited to 'hl')
| -rw-r--r-- | hl/fortran/examples/Makefile.am | 2 | ||||
| -rw-r--r-- | hl/fortran/src/Makefile.am | 3 | ||||
| -rw-r--r-- | hl/fortran/test/Makefile.am | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/hl/fortran/examples/Makefile.am b/hl/fortran/examples/Makefile.am index d383f9a..71c2866 100644 --- a/hl/fortran/examples/Makefile.am +++ b/hl/fortran/examples/Makefile.am @@ -62,4 +62,4 @@ EXAMPLETOPDIR=${DESTDIR}$(exec_prefix)/share/hdf5_examples/hl # and fortran libraries above. include $(top_srcdir)/config/examples.am -include $(top_srcdir)/config/conclude_fc.am +include $(top_srcdir)/config/conclude.am diff --git a/hl/fortran/src/Makefile.am b/hl/fortran/src/Makefile.am index 37e074c..f51d595 100644 --- a/hl/fortran/src/Makefile.am +++ b/hl/fortran/src/Makefile.am @@ -114,4 +114,5 @@ H5IMff.lo: $(srcdir)/H5IMff.F90 H5TBff.lo: $(srcdir)/H5TBff.F90 H5LTff_gen.lo: H5LTff.lo H5LTff_gen.F90 H5TBff_gen.lo: H5TBff.lo H5LTff_gen.F90 H5TBff_gen.F90 -include $(top_srcdir)/config/conclude_fc.am + +include $(top_srcdir)/config/conclude.am diff --git a/hl/fortran/test/Makefile.am b/hl/fortran/test/Makefile.am index 0552aaa..ef7cd4b 100644 --- a/hl/fortran/test/Makefile.am +++ b/hl/fortran/test/Makefile.am @@ -62,4 +62,4 @@ clean-local: # from tests in conclude.am) FORTRAN_API=yes -include $(top_srcdir)/config/conclude_fc.am +include $(top_srcdir)/config/conclude.am |