Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Fortran H5ES module to deploy list #3342

Merged
merged 3 commits into from
Aug 5, 2023
Merged

Add Fortran H5ES module to deploy list #3342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c039cb
Add Fortran H5ES module to deploy list
byrnHDF Aug 3, 2023
cdc32ef
Merge branch 'hdf5_1_14' of https://github.com/HDFGroup/hdf5.git into…
byrnHDF Aug 4, 2023
591fce2
Change fortran mod file export to use a list of names
byrnHDF Aug 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 30 additions & 44 deletions fortran/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,29 +427,34 @@ else ()
)
endif ()

set (mod_export_files
h5fortran_types.mod
hdf5.mod
h5fortkit.mod
h5global.mod
h5a.mod
h5d.mod
h5e.mod
h5es.mod
h5f.mod
h5g.mod
h5i.mod
h5l.mod
h5lib.mod
h5o.mod
h5p.mod
h5r.mod
h5s.mod
h5t.mod
h5vl.mod
h5z.mod
h5_gen.mod
)

if (BUILD_STATIC_LIBS)
set (mod_files
${MOD_BUILD_DIR}/h5fortran_types.mod
${MOD_BUILD_DIR}/hdf5.mod
${MOD_BUILD_DIR}/h5fortkit.mod
${MOD_BUILD_DIR}/h5global.mod
${MOD_BUILD_DIR}/h5a.mod
${MOD_BUILD_DIR}/h5d.mod
${MOD_BUILD_DIR}/h5e.mod
${MOD_BUILD_DIR}/h5f.mod
${MOD_BUILD_DIR}/h5g.mod
${MOD_BUILD_DIR}/h5i.mod
${MOD_BUILD_DIR}/h5l.mod
${MOD_BUILD_DIR}/h5lib.mod
${MOD_BUILD_DIR}/h5o.mod
${MOD_BUILD_DIR}/h5p.mod
${MOD_BUILD_DIR}/h5r.mod
${MOD_BUILD_DIR}/h5s.mod
${MOD_BUILD_DIR}/h5t.mod
${MOD_BUILD_DIR}/h5vl.mod
${MOD_BUILD_DIR}/h5z.mod
${MOD_BUILD_DIR}/h5_gen.mod
)
foreach (mod_file ${mod_export_files})
set (mod_files ${mod_files} ${MOD_BUILD_DIR}/${mod_file})
endforeach ()
install (
FILES
${mod_files}
Expand All @@ -471,28 +476,9 @@ if (BUILD_STATIC_LIBS)
endif ()

if (BUILD_SHARED_LIBS)
set (modsh_files
${MODSH_BUILD_DIR}/h5fortran_types.mod
${MODSH_BUILD_DIR}/hdf5.mod
${MODSH_BUILD_DIR}/h5fortkit.mod
${MODSH_BUILD_DIR}/h5global.mod
${MODSH_BUILD_DIR}/h5a.mod
${MODSH_BUILD_DIR}/h5d.mod
${MODSH_BUILD_DIR}/h5e.mod
${MODSH_BUILD_DIR}/h5f.mod
${MODSH_BUILD_DIR}/h5g.mod
${MODSH_BUILD_DIR}/h5i.mod
${MODSH_BUILD_DIR}/h5l.mod
${MODSH_BUILD_DIR}/h5lib.mod
${MODSH_BUILD_DIR}/h5o.mod
${MODSH_BUILD_DIR}/h5p.mod
${MODSH_BUILD_DIR}/h5r.mod
${MODSH_BUILD_DIR}/h5s.mod
${MODSH_BUILD_DIR}/h5t.mod
${MODSH_BUILD_DIR}/h5vl.mod
${MODSH_BUILD_DIR}/h5z.mod
${MODSH_BUILD_DIR}/h5_gen.mod
)
foreach (mod_file ${mod_export_files})
set (modsh_files ${modsh_files} ${MODSH_BUILD_DIR}/${mod_file})
endforeach ()
install (
FILES
${modsh_files}
Expand Down
30 changes: 14 additions & 16 deletions hl/fortran/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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}
Expand Down
5 changes: 4 additions & 1 deletion release_docs/USING_HDF5_VS.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,10 @@ Using Visual Studio 2010 and above with HDF5 Libraries built with Visual Studio
library, and then optionally the HDF5 High Level, Fortran or C++
libraries. For example, to compile a C++ application, enter:

szip.lib zlib.lib hdf5.lib hdf5_cpp.lib
hdf5.lib hdf5_cpp.lib

For static linking:
libszaec.lib libaec.lib libzlib.lib libhdf5.lib libhdf5_cpp.lib


==========================================================================
Expand Down