diff options
| author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2019-06-14 18:13:31 (GMT) |
|---|---|---|
| committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2019-06-14 18:13:31 (GMT) |
| commit | 57d5c207d94bf876c934094cc7193858590a2c9f (patch) | |
| tree | ec85579dda96c132764de301861950ce5c4a0845 /fortran | |
| parent | 650f9e616dbb60aa8ef1706a6968aacd1c23a568 (diff) | |
| parent | 79916da3036f94a368ba8b29cb18c507e9939e16 (diff) | |
| download | hdf5-57d5c207d94bf876c934094cc7193858590a2c9f.zip hdf5-57d5c207d94bf876c934094cc7193858590a2c9f.tar.gz hdf5-57d5c207d94bf876c934094cc7193858590a2c9f.tar.bz2 | |
Merge pull request #1734 in HDFFV/hdf5 from ~BRTNFLD/hdf5_msb:develop to develop
* commit '79916da3036f94a368ba8b29cb18c507e9939e16':
added missing MOD dependency
added missing MOD dependency
Diffstat (limited to 'fortran')
| -rw-r--r-- | fortran/test/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | fortran/test/Makefile.am | 2 | ||||
| -rw-r--r-- | fortran/test/vol_connector.F90 | 4 |
3 files changed, 5 insertions, 9 deletions
diff --git a/fortran/test/CMakeLists.txt b/fortran/test/CMakeLists.txt index 921e29a..c5a47c0 100644 --- a/fortran/test/CMakeLists.txt +++ b/fortran/test/CMakeLists.txt @@ -571,9 +571,7 @@ endif () #-- Adding test for vol_connector add_executable (vol_connector - vol_connector.F90 - tH5L_F03.F90 - tHDF5_F03.F90) + vol_connector.F90) target_include_directories (vol_connector PRIVATE @@ -605,9 +603,7 @@ add_dependencies (vol_connector ${HDF5_F90_TEST_LIB_TARGET}) if (BUILD_SHARED_LIBS) add_executable (vol_connector-shared - vol_connector.F90 - tH5L_F03.F90 - tHDF5_F03.F90) + vol_connector.F90) target_include_directories (vol_connector-shared PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY}/shared diff --git a/fortran/test/Makefile.am b/fortran/test/Makefile.am index f0d7f03..30bb2a0 100644 --- a/fortran/test/Makefile.am +++ b/fortran/test/Makefile.am @@ -50,7 +50,7 @@ fortranlib_test_1_8_SOURCES = tH5O.F90 tH5A_1_8.F90 tH5G_1_8.F90 tH5MISC_1_8.F90 fortranlib_test_F03_SOURCES = tH5E_F03.F90 tH5F_F03.F90 tH5L_F03.F90 \ tH5O_F03.F90 tH5P_F03.F90 tH5T_F03.F90 tHDF5_F03.F90 fortranlib_test_F03.F90 -vol_connector_SOURCES=vol_connector.F90 +vol_connector_SOURCES=tf_gen.F90 tf.F90 vol_connector.F90 fflush1_SOURCES=fflush1.F90 fflush2_SOURCES=fflush2.F90 diff --git a/fortran/test/vol_connector.F90 b/fortran/test/vol_connector.F90 index 623767b..655b690 100644 --- a/fortran/test/vol_connector.F90 +++ b/fortran/test/vol_connector.F90 @@ -28,7 +28,8 @@ MODULE VOL_TMOD USE HDF5 - USE THDF5_F03 + USE TH5_MISC + USE TH5_MISC_GEN IMPLICIT NONE INTEGER, PARAMETER :: NATIVE_VOL_CONNECTOR_VALUE = 0 @@ -236,7 +237,6 @@ END MODULE VOL_TMOD PROGRAM vol_connector USE HDF5 - USE THDF5_F03 USE VOL_TMOD IMPLICIT NONE |