diff options
| author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2016-10-06 20:34:39 (GMT) |
|---|---|---|
| committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2016-10-06 20:34:39 (GMT) |
| commit | c604bca0445ba1d05a976a673768fa677422e93e (patch) | |
| tree | 7d5438638d4081cb0fcbd1620f6ca0eaf543f1fe /config | |
| parent | 783f01f478f99711710b24d8c85b0555dcdcf1fc (diff) | |
| parent | f9364c0080405bb36d704eb3f9505029d3da41f4 (diff) | |
| download | hdf5-c604bca0445ba1d05a976a673768fa677422e93e.zip hdf5-c604bca0445ba1d05a976a673768fa677422e93e.tar.gz hdf5-c604bca0445ba1d05a976a673768fa677422e93e.tar.bz2 | |
Merge pull request #47 in HDFFV/hdf5 from ~BRTNFLD/hdf5_msb:develop to develop
* commit 'f9364c0080405bb36d704eb3f9505029d3da41f4':
removed the use of C_SIZEOF for non BIND(C) derived type
Fixed test to use storage_size instead of c_sizeof when available.
fixed missing closing bracket
Removed unused variables.
Fixed: Fortran_DOUBLE was being set to C_LONG_DOUBLE when C_LONG_DOUBLE is not available.
Removed duplicate FCFLAG
Removed duplicate FCFLAG.
Added number of integer KINDs found to the header files.
Added path to source include files when building buidiface.
Added rule to build buildiface program, without a rule, build would add repeated compile options when using the NAG compiler.
Misc. cleaning up of the program.
Added SEQUENCE to derived types for NAG:
misc. format code-cleanup
Removed the use of hard-coded integer KINDs.
Code clean-up.
HDFFV-9973 Fortran library fails to compile and fails tests with NAG compiler
Diffstat (limited to 'config')
| -rw-r--r-- | config/cmake/HDF5UseFortran.cmake | 3 | ||||
| -rw-r--r-- | config/conclude_fc.am | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/config/cmake/HDF5UseFortran.cmake b/config/cmake/HDF5UseFortran.cmake index 41efadc..eba448c 100644 --- a/config/cmake/HDF5UseFortran.cmake +++ b/config/cmake/HDF5UseFortran.cmake @@ -159,9 +159,12 @@ set(PAC_FC_ALL_REAL_KINDS "\{${pac_validRealKinds}\}") list(GET PROG_OUTPUT 3 NUM_IKIND) list(GET PROG_OUTPUT 4 NUM_RKIND) +set(PAC_FORTRAN_NUM_INTEGER_KINDS "${NUM_IKIND}") + set(H5CONFIG_F_NUM_IKIND "INTEGER, PARAMETER :: num_ikinds = ${NUM_IKIND}") set(H5CONFIG_F_IKIND "INTEGER, DIMENSION(1:num_ikinds) :: ikind = (/${pac_validIntKinds}/)") +message (STATUS "....NUMBER OF INTEGER KINDS FOUND ${PAC_FORTRAN_NUM_INTEGER_KINDS}") message (STATUS "....REAL KINDS FOUND ${PAC_FC_ALL_REAL_KINDS}") message (STATUS "....INTEGER KINDS FOUND ${PAC_FC_ALL_REAL_KINDS}") message (STATUS "....MAX DECIMAL PRECISION ${H5_PAC_FC_MAX_REAL_PRECISION}") diff --git a/config/conclude_fc.am b/config/conclude_fc.am index d9e7b56..6402412 100644 --- a/config/conclude_fc.am +++ b/config/conclude_fc.am @@ -26,8 +26,8 @@ LTPPFCCOMPILE = $(LIBTOOL) --tag=FC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=co # Treat all .f90 and .F90 files as preprocessed Fortran. .f90.o: - $(PPFCCOMPILE) -c -o $@ $(FCFLAGS) $< + $(PPFCCOMPILE) -c -o $@ $< .F90.o: - $(PPFCCOMPILE) -c -o $@ $(FCFLAGS) $< + $(PPFCCOMPILE) -c -o $@ $< include $(top_srcdir)/config/conclude.am |