diff options
Diffstat (limited to 'fortran')
| -rw-r--r-- | fortran/src/CMakeLists.txt | 35 | ||||
| -rw-r--r-- | fortran/src/H5_buildiface.F90 | 10 | ||||
| -rw-r--r-- | fortran/src/HDF5.F90 | 2 | ||||
| -rw-r--r-- | fortran/src/Makefile.am | 8 | ||||
| -rw-r--r-- | fortran/src/Makefile.in | 14 |
5 files changed, 20 insertions, 49 deletions
diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt index 51a5eb4..b0737d5 100644 --- a/fortran/src/CMakeLists.txt +++ b/fortran/src/CMakeLists.txt @@ -38,7 +38,6 @@ configure_file (${HDF5_F90_SRC_SOURCE_DIR}/H5fort_type_defines.h.in ${HDF5_F90_B #----------------------------------------------------------------------------- # Setup the Fortran auto-detection utilities # H5test_kind.F90 used to generate various KIND interfaces -# H5fortran_detect.F90 used to generate H5fort_type_defines.h # H5fort_type_defines.h used to generate H5f90i_gen.h + H5fortran_types.F90 #----------------------------------------------------------------------------- @@ -65,39 +64,11 @@ set_target_properties (H5_buildiface PROPERTIES set (CMD $<TARGET_FILE:H5_buildiface>) add_custom_command ( - OUTPUT ${HDF5_F90_BINARY_DIR}/H5fortran_detect.F90 - ${HDF5_F90_BINARY_DIR}/H5_KINDff.F90 + OUTPUT ${HDF5_F90_BINARY_DIR}/H5_gen.F90 COMMAND ${CMD} - ARGS > ${HDF5_F90_BINARY_DIR}/H5fortran_detect.F90 WORKING_DIRECTORY ${HDF5_F90_BINARY_DIR} DEPENDS H5_buildiface ) -#----------------------------------------------------------------------------- -#add_executable (H5fortran_detect -# ${HDF5_F90_BINARY_DIR}/H5fortran_detect.F90 -#) -#if (WIN32 AND MSVC) -# if (BUILD_SHARED_LIBS) -# set_target_properties (H5fortran_detect -# PROPERTIES -# COMPILE_FLAGS "/MT" -# ) -# endif (BUILD_SHARED_LIBS) -# set_target_properties (H5fortran_detect -# PROPERTIES -# LINK_FLAGS "/SUBSYSTEM:CONSOLE" -# ) -#endif (WIN32 AND MSVC) -#set_target_properties (H5fortran_detect PROPERTIES LINKER_LANGUAGE Fortran) -# -#set (CMD $<TARGET_FILE:H5fortran_detect>) -#add_custom_command ( -# OUTPUT ${HDF5_F90_BINARY_DIR}/H5fort_type_defines.h -# COMMAND ${CMD} -# ARGS > ${HDF5_F90_BINARY_DIR}/H5fort_type_defines.h -# WORKING_DIRECTORY ${HDF5_F90_BINARY_DIR} -# DEPENDS H5fortran_detect -#) INCLUDE_DIRECTORIES (${HDF5_F90_BINARY_DIR} ${CMAKE_Fortran_MODULE_DIRECTORY}) #----------------------------------------------------------------------------- @@ -183,7 +154,7 @@ set (f90_F_SRCS ${f90_F_SRCS} # generated file - ${HDF5_F90_BINARY_DIR}/H5_KINDff.F90 + ${HDF5_F90_BINARY_DIR}/H5_gen.F90 # normal distribution ${HDF5_F90_SRC_SOURCE_DIR}/HDF5.F90 @@ -265,7 +236,7 @@ set (mod_files ${MOD_BUILD_DIR}/h5s.mod ${MOD_BUILD_DIR}/h5t.mod ${MOD_BUILD_DIR}/h5z.mod - ${MOD_BUILD_DIR}/h5_kind.mod + ${MOD_BUILD_DIR}/h5_gen.mod ) install ( FILES diff --git a/fortran/src/H5_buildiface.F90 b/fortran/src/H5_buildiface.F90 index 4f7f965..7de9760 100644 --- a/fortran/src/H5_buildiface.F90 +++ b/fortran/src/H5_buildiface.F90 @@ -102,12 +102,12 @@ PROGRAM test_kind ! new APIs to handle those use cases. Handling rank 7 and less is for backward compatibility ! with the Fortran 90/95 APIs codes which could never handle rank 15 array sizes. - OPEN(11,FILE='H5_KINDff.F90') + OPEN(11,FILE='H5_gen.F90') WRITE(11,'(40(A,/))') & -'!****h* ROBODoc/H5_KINDff.F90',& +'!****h* ROBODoc/H5_gen.F90',& '!',& '! NAME',& -'! H5_KIND',& +'! H5_gen',& '! ',& '! PURPOSE',& '! This module is generated at build by H5_buildiface.F90 to handle all the',& @@ -134,7 +134,7 @@ PROGRAM test_kind '!',& '!*****' - WRITE(11,'(a)') "MODULE H5_KIND" + WRITE(11,'(a)') "MODULE H5_GEN" WRITE(11,'(A)') ' USE, INTRINSIC :: ISO_C_BINDING' WRITE(11,'(A)') ' USE H5GLOBAL' @@ -545,7 +545,7 @@ PROGRAM test_kind WRITE(11,'(A)') ' END SUBROUTINE h5pinsert_kind_'//TRIM(ADJUSTL(chr2)) ENDDO - WRITE(11,'(A)') 'END MODULE H5_KIND' + WRITE(11,'(A)') 'END MODULE H5_gen' CLOSE(11) diff --git a/fortran/src/HDF5.F90 b/fortran/src/HDF5.F90 index 8d0513a..64f5be6 100644 --- a/fortran/src/HDF5.F90 +++ b/fortran/src/HDF5.F90 @@ -41,6 +41,6 @@ MODULE HDF5 USE H5P USE H5R USE H5Z - USE H5_KIND + USE H5_gen USE H5LIB END MODULE HDF5 diff --git a/fortran/src/Makefile.am b/fortran/src/Makefile.am index 5f6c8e8..3333ae6 100644 --- a/fortran/src/Makefile.am +++ b/fortran/src/Makefile.am @@ -46,7 +46,7 @@ endif libhdf5_fortran_la_SOURCES=H5f90global.F90 \ H5fortran_types.F90 H5_ff.F90 H5Aff.F90 H5Dff.F90 H5Eff.F90 \ H5Fff.F90 H5Gff.F90 H5Iff.F90 H5Lff.F90 H5Off.F90 H5Pff.F90 H5Rff.F90 H5Sff.F90 \ - H5Tff.F90 H5Zff.F90 H5_KINDff.f90 \ + H5Tff.F90 H5Zff.F90 H5_gen.f90 \ H5f90kit.c H5_f.c H5Af.c H5Df.c H5Ef.c H5Ff.c H5Gf.c \ H5If.c H5Lf.c H5Of.c H5Pf.c H5Rf.c H5Sf.c H5Tf.c H5Zf.c HDF5.f90 @@ -140,7 +140,7 @@ H5fortran_types.F90 H5f90i_gen.h: H5match_types$(EXEEXT) # H5_buildiface.F90 generates all the APIs that have a KIND type associated # with them. -H5_KINDff.F90: H5_buildiface$(EXEEXT) +H5_gen.F90: H5_buildiface$(EXEEXT) $(RUNSERIAL) ./H5_buildiface$(EXEEXT) # H5_buildiface.F90 is included in the distribution, and Automake knows @@ -173,12 +173,12 @@ H5Rff.lo: $(srcdir)/H5Rff.F90 H5f90global.lo H5Sff.lo: $(srcdir)/H5Sff.F90 H5f90global.lo H5Tff.lo: $(srcdir)/H5Tff.F90 H5f90global.lo H5Zff.lo: $(srcdir)/H5Zff.F90 H5f90global.lo -H5_KINDff.lo: H5_KINDff.F90 H5f90global.lo H5Aff.lo H5Dff.lo H5Pff.lo +H5_gen.lo: H5_gen.F90 H5f90global.lo H5Aff.lo H5Dff.lo H5Pff.lo HDF5.lo: $(srcdir)/HDF5.F90 H5f90global.lo H5_ff.lo H5Aff.lo \ H5Dff.lo \ H5Eff.lo \ H5Fff.lo H5Gff.lo H5Iff.lo H5Lff.lo \ H5Off.lo H5Pff.lo H5Rff.lo \ - H5Sff.lo H5Tff.lo H5Zff.lo H5_KINDff.lo + H5Sff.lo H5Tff.lo H5Zff.lo H5_gen.lo include $(top_srcdir)/config/conclude.am diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in index 30867e2..f11fa98 100644 --- a/fortran/src/Makefile.in +++ b/fortran/src/Makefile.in @@ -153,9 +153,9 @@ libhdf5_fortran_la_DEPENDENCIES = $(LIBHDF5) am_libhdf5_fortran_la_OBJECTS = H5f90global.lo H5fortran_types.lo \ H5_ff.lo H5Aff.lo H5Dff.lo H5Eff.lo H5Fff.lo H5Gff.lo H5Iff.lo \ H5Lff.lo H5Off.lo H5Pff.lo H5Rff.lo H5Sff.lo H5Tff.lo H5Zff.lo \ - H5_KINDff.lo H5f90kit.lo H5_f.lo H5Af.lo H5Df.lo H5Ef.lo \ - H5Ff.lo H5Gf.lo H5If.lo H5Lf.lo H5Of.lo H5Pf.lo H5Rf.lo \ - H5Sf.lo H5Tf.lo H5Zf.lo HDF5.lo + H5_gen.lo H5f90kit.lo H5_f.lo H5Af.lo H5Df.lo H5Ef.lo H5Ff.lo \ + H5Gf.lo H5If.lo H5Lf.lo H5Of.lo H5Pf.lo H5Rf.lo H5Sf.lo \ + H5Tf.lo H5Zf.lo HDF5.lo libhdf5_fortran_la_OBJECTS = $(am_libhdf5_fortran_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -741,7 +741,7 @@ libhdf5_fortran_la_LDFLAGS = -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISI libhdf5_fortran_la_SOURCES = H5f90global.F90 \ H5fortran_types.F90 H5_ff.F90 H5Aff.F90 H5Dff.F90 H5Eff.F90 \ H5Fff.F90 H5Gff.F90 H5Iff.F90 H5Lff.F90 H5Off.F90 H5Pff.F90 H5Rff.F90 H5Sff.F90 \ - H5Tff.F90 H5Zff.F90 H5_KINDff.f90 \ + H5Tff.F90 H5Zff.F90 H5_gen.f90 \ H5f90kit.c H5_f.c H5Af.c H5Df.c H5Ef.c H5Ff.c H5Gf.c \ H5If.c H5Lf.c H5Of.c H5Pf.c H5Rf.c H5Sf.c H5Tf.c H5Zf.c HDF5.f90 @@ -1410,7 +1410,7 @@ H5fortran_types.F90 H5f90i_gen.h: H5match_types$(EXEEXT) # H5_buildiface.F90 generates all the APIs that have a KIND type associated # with them. -H5_KINDff.F90: H5_buildiface$(EXEEXT) +H5_gen.F90: H5_buildiface$(EXEEXT) $(RUNSERIAL) ./H5_buildiface$(EXEEXT) # Hardcode the dependencies of these files. There isn't a known way of @@ -1435,13 +1435,13 @@ H5Rff.lo: $(srcdir)/H5Rff.F90 H5f90global.lo H5Sff.lo: $(srcdir)/H5Sff.F90 H5f90global.lo H5Tff.lo: $(srcdir)/H5Tff.F90 H5f90global.lo H5Zff.lo: $(srcdir)/H5Zff.F90 H5f90global.lo -H5_KINDff.lo: H5_KINDff.F90 H5f90global.lo H5Aff.lo H5Dff.lo H5Pff.lo +H5_gen.lo: H5_gen.F90 H5f90global.lo H5Aff.lo H5Dff.lo H5Pff.lo HDF5.lo: $(srcdir)/HDF5.F90 H5f90global.lo H5_ff.lo H5Aff.lo \ H5Dff.lo \ H5Eff.lo \ H5Fff.lo H5Gff.lo H5Iff.lo H5Lff.lo \ H5Off.lo H5Pff.lo H5Rff.lo \ - H5Sff.lo H5Tff.lo H5Zff.lo H5_KINDff.lo + H5Sff.lo H5Tff.lo H5Zff.lo H5_gen.lo # lib/progs/tests targets recurse into subdirectories. build-* targets # build files in this directory. |