diff options
| author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2011-09-27 05:02:38 (GMT) |
|---|---|---|
| committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2011-09-27 05:02:38 (GMT) |
| commit | 4af3cd2b7a89b2eeed05d5ec0b0641ca7c2545bc (patch) | |
| tree | 01f90619962c447280074bb8d10ae5c7b2b9acbc /fortran/test/Makefile.am | |
| parent | a07004c825e3a4e4b61269fd3e5f2b57092f073c (diff) | |
| download | hdf5-4af3cd2b7a89b2eeed05d5ec0b0641ca7c2545bc.zip hdf5-4af3cd2b7a89b2eeed05d5ec0b0641ca7c2545bc.tar.gz hdf5-4af3cd2b7a89b2eeed05d5ec0b0641ca7c2545bc.tar.bz2 | |
[svn-r21421] Merged the Fortran 2003 changes from the trunk into the 1.8 branch, used:
svn merge -r 20506:21414 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/fortran
Tested: jam (gnu, intel, pgi compilers)
Also merged effected non-Fortran files:
svn merge -r21247:r21248 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/src/libhdf5.settings.in
Diffstat (limited to 'fortran/test/Makefile.am')
| -rw-r--r-- | fortran/test/Makefile.am | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/fortran/test/Makefile.am b/fortran/test/Makefile.am index fb4d6ca..b261785 100644 --- a/fortran/test/Makefile.am +++ b/fortran/test/Makefile.am @@ -35,8 +35,21 @@ else AM_LDFLAGS+=-static endif +# Check if the compiler supports the Fortran 2003 standard +# which should include the intrinsic module iso_c_binding +if FORTRAN_2003_CONDITIONAL_F + ff_PREFIX = F03 +else + ff_PREFIX = F90 +endif + # Our main targets, the tests themselves TEST_PROG=fortranlib_test fflush1 fflush2 fortranlib_test_1_8 + +if FORTRAN_2003_CONDITIONAL_F + TEST_PROG += fortranlib_test_F03 +endif + check_PROGRAMS=$(TEST_PROG) libh5test_fortran_la_SOURCES= tf.f90 t.c @@ -51,8 +64,14 @@ fortranlib_test_SOURCES = fortranlib_test.f90 \ tH5Sselect.f90 tH5P.f90 tH5A.f90 tH5I.f90 tH5G.f90 tH5E.f90 fortranlib_test_1_8_SOURCES = fortranlib_test_1_8.f90 \ - tH5F.f90 tH5O.f90 tH5A_1_8.f90 tH5G_1_8.f90 - + tH5F.f90 tH5O.f90 tH5A_1_8.f90 tH5G_1_8.f90 + +if FORTRAN_2003_CONDITIONAL_F + fortranlib_test_F03_SOURCES = fortranlib_test_F03.f90 \ + tH5F.f90 tH5E_F03.f90 tH5L_F03.f90 tH5P_F03.f90 tH5T_F03.f90 +endif + + fflush1_SOURCES=fflush1.f90 fflush2_SOURCES=fflush2.f90 |