summaryrefslogtreecommitdiffstats
path: root/hl
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2023-08-10 13:02:38 (GMT)
committerGitHub <noreply@github.com>2023-08-10 13:02:38 (GMT)
commit0c1ad6cb2533ddb3d67f1b328c42116c471d65ba (patch)
tree5edb23606bfdcc1392d0ab01ac6ff868bacab626 /hl
parentf3de9ee39d9c5d24389cb652ce1a583e61d40af2 (diff)
downloadhdf5-0c1ad6cb2533ddb3d67f1b328c42116c471d65ba.zip
hdf5-0c1ad6cb2533ddb3d67f1b328c42116c471d65ba.tar.gz
hdf5-0c1ad6cb2533ddb3d67f1b328c42116c471d65ba.tar.bz2
Merges from 1.14 Aug 4-9 (#3366)
* Make h5dump spacing consistent when printing VLEN datatype (#3351) (#3352) * Add Fortran H5ES module to deploy list (#3342) * Fix for the bug exposed from running test/set_extent.c when selection I/O is enabled. (#3319) The test/set_extent.c is modified to test for selection I/O enabled. * Merge Implementation of the mpio driver with selection I/O. (#3360) * Work around a testphdf5 failure on Cray MPICH machines (#3361) (#3362) * set H5_PAC_C_MAX_REAL_PRECISION default to 0 when cross compiling (#3365) with CMake to fix Fortran build failures.
Diffstat (limited to 'hl')
-rw-r--r--hl/fortran/src/CMakeLists.txt30
1 files changed, 14 insertions, 16 deletions
diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt
index 705a37a..0aa0f15 100644
--- a/hl/fortran/src/CMakeLists.txt
+++ b/hl/fortran/src/CMakeLists.txt
@@ -235,16 +235,19 @@ endif ()
# Add file(s) to CMake Install
#-----------------------------------------------------------------------------
+set (mod_export_files
+ h5ds.mod
+ h5tb.mod
+ h5tb_const.mod
+ h5lt.mod
+ h5lt_const.mod
+ h5im.mod
+)
if (BUILD_STATIC_LIBS)
- set (mod_files
- ${MOD_BUILD_DIR}/h5ds.mod
- ${MOD_BUILD_DIR}/h5tb.mod
- ${MOD_BUILD_DIR}/h5tb_const.mod
- ${MOD_BUILD_DIR}/h5lt.mod
- ${MOD_BUILD_DIR}/h5lt_const.mod
- ${MOD_BUILD_DIR}/h5im.mod
- )
+ foreach (mod_file ${mod_export_files})
+ set (mod_files ${mod_files} ${MOD_BUILD_DIR}/${mod_file})
+ endforeach ()
install (
FILES
${mod_files}
@@ -265,14 +268,9 @@ if (BUILD_STATIC_LIBS)
endif ()
endif ()
if (BUILD_SHARED_LIBS)
- set (modsh_files
- ${MODSH_BUILD_DIR}/h5ds.mod
- ${MODSH_BUILD_DIR}/h5tb.mod
- ${MODSH_BUILD_DIR}/h5tb_const.mod
- ${MODSH_BUILD_DIR}/h5lt.mod
- ${MODSH_BUILD_DIR}/h5lt_const.mod
- ${MODSH_BUILD_DIR}/h5im.mod
- )
+ foreach (mod_file ${mod_export_files})
+ set (modsh_files ${modsh_files} ${MODSH_BUILD_DIR}/${mod_file})
+ endforeach ()
install (
FILES
${modsh_files}