mirror of
https://github.com/HDFGroup/hdf5.git
synced 2026-09-25 04:09:44 +03:00
Update hdf5 2.1.0 with 17commits from develop since 2/5/2026 (#6229)
* Fix MPI Fortran configuration for HDF5Examples (#6206) When building Fortran parallel examples without MPI wrappers, the compiler couldn't find mpi.mod because MPI_Fortran_INCLUDE_DIRS was not populated. This occurred because find_package(MPI) was only called for C, not Fortran. Added enable_language(Fortran) and find_package(MPI REQUIRED COMPONENTS Fortran) to properly configure MPI for Fortran examples, ensuring MPI include directories and libraries are correctly set. * Adds RFCs to the RFC table (#6190) * Added two RFCs to the RFC table "Adding support for digitally signed plugins to HDF5" " Write-Ahead log" * Updated to use the ACM link * Add HDF5 2.0.0 Library Migration Guide (#6183) * Add HDF5 2.0.0 Library Migration Guide * Revise HDF5 migration guide for version 2.0.0 Use 2.0.0 consistently. * Clarify API changes in HDF5 2.0.0 Migration Guide * Fixes the "multiple @param documentation sections" doxygen warnings (#6195) Addresses the "multiple @ param documentation sections" warnings are caused by the interaction of three things: 1. MACRO_EXPANSION = YES with EXPAND_ONLY_PREDEF = NO in Doxyfile.in 2. Versioned API macros in H5version.h like: \def documentation in APIVersions.dox like: 3. \def H5Tarray_create \api_vers_2{H5Tarray_create,H5Tarray_create1,H5Tarray_create2} Because Doxygen expands all macros, it sees H5Tarray_create as an alias for H5Tarray_create1. It then associates documentation from both the \def block (for the macro) and the function's own doc block (with \param entries) with the same function — resulting in "multiple @ param documentation sections." * Update Doxygen version from 1.16.0 to 1.16.1 Use Doxygen 1.16.1 for all platforms. This version includes the latest bug fixes and improvements while maintaining compatibility with our documentation format. * Fix Windows Doxygen installation for version 1.16.1 Handle different Windows binary naming conventions across Doxygen versions: - 1.16.1 uses: doxygen-VERSION.windows.x64.bin.zip - 1.16.0 uses: doxygen-VERSION.x64.bin.zip Try the newer naming convention first, then fall back to the older one if the download fails. This ensures compatibility across versions. * Use ssciwr/doxygen-install in setup-doxygen action Replace direct installation of official Doxygen binaries with ssciwr/doxygen-install action. This avoids Java documentation parsing errors that occur with official binaries but not with distribution builds. The setup-doxygen action now serves as a thin wrapper around ssciwr/doxygen-install@f13be16c83 (v1), using commit hash for security and reproducibility. * Remove redundant version specification from workflows The setup-doxygen action already has a default version (1.16.1), so explicit version specification in workflows is unnecessary. This follows DRY principles and makes version updates simpler. * Updates to #6205 (#6208) * Fix MPI Fortran configuration for HDF5Examples (#6205) When building Fortran parallel examples standalone without MPI wrappers, the compiler cannot find mpi.mod because MPI_Fortran_INCLUDE_DIRS is not populated. * Use MPI::MPI_Fortran imported target instead of raw MPI variables Replace manual MPI_Fortran_LIBRARIES, MPI_Fortran_LINK_FLAGS, and MPI_Fortran_INCLUDE_DIRS usage with the MPI::MPI_Fortran imported target, which transitively carries all include dirs, compile flags, and link flags. This eliminates the CMAKE_Fortran_EXE_LINKER_FLAGS hack and the manual target_include_directories in H5PAR. * Update nvhpc version to 26.1 with CUDA version 13.1. (#6213) # branches: [develop] * Inherit Debug C build flags in Developer build mode (#6182) * Bump the github-actions group across 1 directory with 11 updates (#6215) * Bump the github-actions group across 1 directory with 11 updates Bumps the github-actions group with 11 updates in the / directory: | Package | From | To | | --- | --- | --- | | [actions/cache](https://github.com/actions/cache) | `5.0.1` | `5.0.3` | | [lukka/get-cmake](https://github.com/lukka/get-cmake) | `4.2.1` | `4.2.3` | | [softwareforgood/check-artifact-v4-existence](https://github.com/softwareforgood/check-artifact-v4-existence) | `0.3.0` | `0.4.1` | | [github/codeql-action](https://github.com/github/codeql-action) | `3.31.9` | `4.32.2` | | [azure/trusted-signing-action](https://github.com/azure/trusted-signing-action) | `0.5.11` | `1.1.0` | | [cygwin/cygwin-install-action](https://github.com/cygwin/cygwin-install-action) | `7d2dc1e241644c3318bed9ec74115d1929baa681` | `2566376092c4e280f21131be027af3f5bb2420a4` | | [aws-actions/configure-aws-credentials](https://github.com/aws-actions/configure-aws-credentials) | `5.1.1` | `6.0.0` | | [vmactions/freebsd-vm](https://github.com/vmactions/freebsd-vm) | `1.3.4` | `1.4.2` | | [vmactions/openbsd-vm](https://github.com/vmactions/openbsd-vm) | `1.3.1` | `1.3.5` | | [mpi4py/setup-mpi](https://github.com/mpi4py/setup-mpi) | `1.4.1` | `1.4.2` | | [actions/setup-python](https://github.com/actions/setup-python) | `6.1.0` | `6.2.0` | vmactions/openbsd-vm@d6c29ce1b4 (`1.3.5`) failed to run ssh on the github runner. 271a1ba62300483cfc58345ff9f425f1349a2cab for v1.3.4 was used instead. * Fix issue with some Subfiling VFD test files not getting deleted (#6212) * CMake: Fix Fortran cross-compilation support Refactor the cross-compilation infrastructure to rely on the standard CMAKE_CROSSCOMPILING_EMULATOR variable instead of the custom CROSSCOMPILING_PATH environment hack. Key changes: - Removed `ENVIRONMENT "${CROSSCOMPILING_PATH}"` from all test definitions. - Updated custom commands (e.g., H5match_types, H5_gen) to invoke the emulator explicitly when cross-compiling. - Updated ConfigureChecks.cmake and HDF5UseFortran.cmake to enable `try_run` checks when an emulator is defined. - Added config/toolchain/mingw-w64-x86-64-wine.sh wrapper to automatically locate MinGW runtime libraries (like libgfortran) for Wine execution. - Cleaned up toolchain files to remove hardcoded emulator paths, deferring configuration to the build environment. * Add Doxygen setup that results in missing Doygen documentation. (#6217) * Added setup-doxygen action in ctest.yml Ubuntu gcc workflow. * Also added actions/checkout for setup-doxygen. * Fixes link checker failure (#6219) Removed https:// as a workaround to avoid error by the link checker. * Remove force-setting of ZLIB_USE_EXTERNAL / SZIP_USE_EXTERNAL (#6222) Removes the force-setting of ZLIB_USE_EXTERNAL and SZIP_USE_EXTERNAL to ON when HDF5_ALLOW_EXTERNAL_SUPPORT is GIT or TGZ so that zlib and szip can be independently built from the system or externally as desired * Truncate Subfiling VFD's stub file when truncating subfiles (#6210) Ensure that the Subfiling VFD's stub file gets truncated when subfiles are being truncated to avoid a potentially unreadable file when the EOF doesn't match the stored EOF value Co-authored-by: Larry Knox <lrknox@hdfgroup.org> * Add CMake function to extract pkg-config info from libraries (#6220) * Consistent extension for C++ (#6214) Except for this file, all use cpp instead of cxx. No obvious reason why the same file types should have different extensions. * Enable Windows ARM64 CTest CI for release binaries (#6177) * ci: add Windows ARM64 MSVC CTest job * ci: add MSYS2 clangarm64 build on Windows ARM64 * cmake: add MSVC ARM64 presets for Windows * zlib: fix MSVC static library flags for ARM64 builds * Renamed .hxx file to .h and updated the #include for it. * Committing clang-format changes --------- Co-authored-by: Scot Breitenfeld <brtnfld@hdfgroup.org> Co-authored-by: bmribler <39579120+bmribler@users.noreply.github.com> Co-authored-by: Gerd Heber <gheber@hdfgroup.org> Co-authored-by: jhendersonHDF <jhenderson@hdfgroup.org> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Julien Schueller <schueller@phimeca.com> Co-authored-by: Martin Diehl <mail@martin-diehl.net> Co-authored-by: Harish RS <harish.rajaselvan@multicorewareinc.com> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
This commit is contained in:
Larry Knox
co-authored by
Scot Breitenfeld
bmribler
Gerd Heber
jhendersonHDF
dependabot[bot]
Julien Schueller
Martin Diehl
Harish RS
github-actions
Scot Breitenfeld
bmribler
Gerd Heber
jhendersonHDF
dependabot[bot]
Julien Schueller
Martin Diehl
Harish RS
github-actions
parent
6f5274847b
commit
cde84cdc8f
@@ -223,7 +223,6 @@ if (H5EXAMPLE_BUILD_TESTING)
|
||||
add_test (NAME ${EXAMPLE_VARNAME}_${testname} COMMAND $<TARGET_FILE:${EXAMPLE_VARNAME}_${testname}>)
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_${testname} PROPERTIES
|
||||
DEPENDS ${EXAMPLE_VARNAME}_${testname}-clearall
|
||||
ENVIRONMENT "${CROSSCOMPILING_PATH}"
|
||||
)
|
||||
else ()
|
||||
add_test (
|
||||
@@ -240,7 +239,6 @@ if (H5EXAMPLE_BUILD_TESTING)
|
||||
)
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_${testname} PROPERTIES
|
||||
DEPENDS ${EXAMPLE_VARNAME}_${testname}-clearall
|
||||
ENVIRONMENT "${CROSSCOMPILING_PATH}"
|
||||
)
|
||||
if (HDF5_PROVIDES_TOOLS)
|
||||
add_test (
|
||||
@@ -257,7 +255,6 @@ if (H5EXAMPLE_BUILD_TESTING)
|
||||
)
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_H5DUMP-${testname} PROPERTIES
|
||||
DEPENDS ${EXAMPLE_VARNAME}_${testname}
|
||||
ENVIRONMENT "${CROSSCOMPILING_PATH}"
|
||||
)
|
||||
endif ()
|
||||
endif ()
|
||||
|
||||
@@ -228,7 +228,6 @@ if (H5EXAMPLE_BUILD_TESTING)
|
||||
)
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_${testname}-ERR PROPERTIES
|
||||
DEPENDS ${EXAMPLE_VARNAME}_${testname}-clearall
|
||||
ENVIRONMENT "${CROSSCOMPILING_PATH}"
|
||||
)
|
||||
add_test (
|
||||
NAME ${EXAMPLE_VARNAME}_${testname}
|
||||
@@ -254,7 +253,6 @@ if (H5EXAMPLE_BUILD_TESTING)
|
||||
)
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_${testname} PROPERTIES
|
||||
DEPENDS ${EXAMPLE_VARNAME}_${testname}-clearall
|
||||
ENVIRONMENT "${CROSSCOMPILING_PATH}"
|
||||
)
|
||||
endif ()
|
||||
set (last_test "${EXAMPLE_VARNAME}_${testname}")
|
||||
@@ -313,7 +311,6 @@ if (H5EXAMPLE_BUILD_TESTING)
|
||||
endif ()
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_H5DUMP-${testname} PROPERTIES
|
||||
DEPENDS ${EXAMPLE_VARNAME}_${testname}
|
||||
ENVIRONMENT "${CROSSCOMPILING_PATH}"
|
||||
)
|
||||
set (last_test "${EXAMPLE_VARNAME}_H5DUMP-${testname}")
|
||||
endif ()
|
||||
|
||||
@@ -249,7 +249,6 @@ if (H5EXAMPLE_BUILD_TESTING)
|
||||
)
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_${testname} PROPERTIES
|
||||
DEPENDS ${EXAMPLE_VARNAME}_${testname}-clearall
|
||||
ENVIRONMENT "${CROSSCOMPILING_PATH}"
|
||||
)
|
||||
if (HDF5_PROVIDES_TOOLS)
|
||||
add_test (
|
||||
@@ -266,7 +265,6 @@ if (H5EXAMPLE_BUILD_TESTING)
|
||||
)
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_H5DUMP-${testname} PROPERTIES
|
||||
DEPENDS ${EXAMPLE_VARNAME}_${testname}
|
||||
ENVIRONMENT "${CROSSCOMPILING_PATH}"
|
||||
)
|
||||
endif ()
|
||||
endif ()
|
||||
@@ -304,7 +302,6 @@ if (H5EXAMPLE_BUILD_TESTING)
|
||||
)
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_H5DUMP-${testname} PROPERTIES
|
||||
DEPENDS ${EXAMPLE_VARNAME}_${testname}
|
||||
ENVIRONMENT "${CROSSCOMPILING_PATH}"
|
||||
)
|
||||
endif ()
|
||||
endif ()
|
||||
@@ -335,7 +332,6 @@ if (H5EXAMPLE_BUILD_TESTING)
|
||||
)
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_${testname} PROPERTIES
|
||||
DEPENDS ${EXAMPLE_VARNAME}_${testname}-clearall
|
||||
ENVIRONMENT "${CROSSCOMPILING_PATH}"
|
||||
)
|
||||
if (HDF5_PROVIDES_TOOLS)
|
||||
add_test (
|
||||
@@ -352,7 +348,6 @@ if (H5EXAMPLE_BUILD_TESTING)
|
||||
)
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_H5DUMP-${testname}1 PROPERTIES
|
||||
DEPENDS ${EXAMPLE_VARNAME}_${testname}
|
||||
ENVIRONMENT "${CROSSCOMPILING_PATH}"
|
||||
)
|
||||
add_test (
|
||||
NAME ${EXAMPLE_VARNAME}_H5DUMP-${testname}2
|
||||
@@ -368,7 +363,6 @@ if (H5EXAMPLE_BUILD_TESTING)
|
||||
)
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_H5DUMP-${testname}2 PROPERTIES
|
||||
DEPENDS ${EXAMPLE_VARNAME}_H5DUMP-${testname}1
|
||||
ENVIRONMENT "${CROSSCOMPILING_PATH}"
|
||||
)
|
||||
endif ()
|
||||
endif ()
|
||||
@@ -397,7 +391,6 @@ if (H5EXAMPLE_BUILD_TESTING)
|
||||
)
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_${testname} PROPERTIES
|
||||
DEPENDS ${EXAMPLE_VARNAME}_${testname}-clearall
|
||||
ENVIRONMENT "${CROSSCOMPILING_PATH}"
|
||||
)
|
||||
endif ()
|
||||
endmacro ()
|
||||
|
||||
@@ -370,7 +370,6 @@ if (H5EXAMPLE_BUILD_TESTING)
|
||||
)
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_${testname} PROPERTIES
|
||||
DEPENDS ${EXAMPLE_VARNAME}_${testname}-clearall
|
||||
ENVIRONMENT "${CROSSCOMPILING_PATH}"
|
||||
)
|
||||
if (HDF5_PROVIDES_TOOLS)
|
||||
add_test (
|
||||
@@ -387,7 +386,6 @@ if (H5EXAMPLE_BUILD_TESTING)
|
||||
)
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_H5DUMP-${testname} PROPERTIES
|
||||
DEPENDS ${EXAMPLE_VARNAME}_${testname}
|
||||
ENVIRONMENT "${CROSSCOMPILING_PATH}"
|
||||
)
|
||||
endif ()
|
||||
endif ()
|
||||
@@ -416,7 +414,6 @@ if (H5EXAMPLE_BUILD_TESTING)
|
||||
)
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_${testname} PROPERTIES
|
||||
DEPENDS ${EXAMPLE_VARNAME}_${testname}-clearall
|
||||
ENVIRONMENT "${CROSSCOMPILING_PATH}"
|
||||
)
|
||||
endif ()
|
||||
endmacro ()
|
||||
|
||||
@@ -144,7 +144,6 @@ if (H5EXAMPLE_BUILD_TESTING)
|
||||
)
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_${testname} PROPERTIES
|
||||
DEPENDS ${EXAMPLE_VARNAME}_${testname}-clearall
|
||||
ENVIRONMENT "${CROSSCOMPILING_PATH}"
|
||||
)
|
||||
if (HDF5_PROVIDES_TOOLS)
|
||||
add_test (
|
||||
@@ -161,7 +160,6 @@ if (H5EXAMPLE_BUILD_TESTING)
|
||||
)
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_H5DUMP-${testname} PROPERTIES
|
||||
DEPENDS ${EXAMPLE_VARNAME}_${testname}
|
||||
ENVIRONMENT "${CROSSCOMPILING_PATH}"
|
||||
)
|
||||
endif ()
|
||||
endif ()
|
||||
|
||||
@@ -215,7 +215,6 @@ if (H5EXAMPLE_BUILD_TESTING)
|
||||
)
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_${testname} PROPERTIES
|
||||
DEPENDS ${EXAMPLE_VARNAME}_${testname}-clearall
|
||||
ENVIRONMENT "${CROSSCOMPILING_PATH}"
|
||||
)
|
||||
if (HDF5_PROVIDES_TOOLS)
|
||||
add_test (
|
||||
@@ -232,7 +231,6 @@ if (H5EXAMPLE_BUILD_TESTING)
|
||||
)
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_H5DUMP-${testname} PROPERTIES
|
||||
DEPENDS ${EXAMPLE_VARNAME}_${testname}
|
||||
ENVIRONMENT "${CROSSCOMPILING_PATH}"
|
||||
)
|
||||
endif ()
|
||||
endif ()
|
||||
@@ -261,7 +259,6 @@ if (H5EXAMPLE_BUILD_TESTING)
|
||||
)
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_${testname} PROPERTIES
|
||||
DEPENDS ${EXAMPLE_VARNAME}_${testname}-clearall
|
||||
ENVIRONMENT "${CROSSCOMPILING_PATH}"
|
||||
)
|
||||
if (HDF5_PROVIDES_TOOLS)
|
||||
add_test (
|
||||
@@ -279,7 +276,6 @@ if (H5EXAMPLE_BUILD_TESTING)
|
||||
)
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_H5DUMP-${testname} PROPERTIES
|
||||
DEPENDS ${EXAMPLE_VARNAME}_${testname}
|
||||
ENVIRONMENT "${CROSSCOMPILING_PATH}"
|
||||
)
|
||||
endif ()
|
||||
endif ()
|
||||
@@ -302,12 +298,10 @@ if (H5EXAMPLE_BUILD_TESTING)
|
||||
add_test (NAME ${EXAMPLE_VARNAME}_h5ex_lite1 COMMAND $<TARGET_FILE:${EXAMPLE_VARNAME}_h5ex_lite1>)
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_h5ex_lite1 PROPERTIES
|
||||
DEPENDS ${EXAMPLE_VARNAME}_h5ex_lite-clearall
|
||||
ENVIRONMENT "${CROSSCOMPILING_PATH}"
|
||||
)
|
||||
add_test (NAME ${EXAMPLE_VARNAME}_h5ex_lite2 COMMAND $<TARGET_FILE:${EXAMPLE_VARNAME}_h5ex_lite2>)
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_h5ex_lite2 PROPERTIES
|
||||
DEPENDS ${EXAMPLE_VARNAME}_h5ex_lite1
|
||||
ENVIRONMENT "${CROSSCOMPILING_PATH}"
|
||||
)
|
||||
else ()
|
||||
add_test (
|
||||
@@ -324,7 +318,6 @@ if (H5EXAMPLE_BUILD_TESTING)
|
||||
)
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_h5ex_lite1 PROPERTIES
|
||||
DEPENDS ${EXAMPLE_VARNAME}_h5ex_lite-clearall
|
||||
ENVIRONMENT "${CROSSCOMPILING_PATH}"
|
||||
)
|
||||
add_test (
|
||||
NAME ${EXAMPLE_VARNAME}_h5ex_lite2
|
||||
@@ -340,7 +333,6 @@ if (H5EXAMPLE_BUILD_TESTING)
|
||||
)
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_h5ex_lite2 PROPERTIES
|
||||
DEPENDS ${EXAMPLE_VARNAME}_h5ex_lite1
|
||||
ENVIRONMENT "${CROSSCOMPILING_PATH}"
|
||||
)
|
||||
endif ()
|
||||
endif ()
|
||||
|
||||
@@ -101,7 +101,6 @@ if (H5EXAMPLE_BUILD_TESTING)
|
||||
endif ()
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_tutr_${testname} PROPERTIES
|
||||
FIXTURES_REQUIRED clear_${EXAMPLE_VARNAME}_tutr
|
||||
ENVIRONMENT "${CROSSCOMPILING_PATH}"
|
||||
)
|
||||
if (last_test)
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_tutr_${testname} PROPERTIES DEPENDS ${last_test})
|
||||
|
||||
@@ -145,14 +145,6 @@ if (${H5_LIBVER_DIR} GREATER 16)
|
||||
if (H5EXAMPLE_BUILD_FORTRAN AND HDF5_PROVIDES_FORTRAN)
|
||||
set (H5EXAMPLE_LINK_Fortran_LIBS ${H5EXAMPLE_HDF5_LINK_LIBS})
|
||||
|
||||
# Parallel IO usage requires MPI to be Linked and Included
|
||||
if (H5_HAVE_PARALLEL)
|
||||
set (H5EXAMPLE_LINK_Fortran_LIBS ${H5EXAMPLE_LINK_Fortran_LIBS} ${MPI_Fortran_LIBRARIES})
|
||||
if (MPI_Fortran_LINK_FLAGS)
|
||||
set (CMAKE_Fortran_EXE_LINKER_FLAGS "${MPI_Fortran_LINK_FLAGS} ${CMAKE_EXE_LINKER_FLAGS}")
|
||||
endif ()
|
||||
endif ()
|
||||
|
||||
configure_file (${H5EXAMPLE_F90_SRC_DIR}/H5D/h5_version.h.in ${PROJECT_BINARY_DIR}/FORTRAN/H5D/h5_version.h @ONLY)
|
||||
configure_file (${H5EXAMPLE_F90_SRC_DIR}/H5D/h5_version.h.in ${PROJECT_BINARY_DIR}/FORTRAN/H5G/h5_version.h @ONLY)
|
||||
else ()
|
||||
@@ -223,6 +215,7 @@ endif ()
|
||||
# Build examples
|
||||
#-----------------------------------------------------------------------------
|
||||
add_subdirectory (C)
|
||||
# Fortran MPI setup (find_package, link flags) is handled in FORTRAN/CMakeLists.txt
|
||||
if (H5EXAMPLE_BUILD_FORTRAN AND HDF5_PROVIDES_FORTRAN)
|
||||
add_subdirectory (FORTRAN)
|
||||
endif ()
|
||||
|
||||
@@ -69,7 +69,6 @@ if (H5EXAMPLE_BUILD_TESTING)
|
||||
endif ()
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_cpp_ex_${testname} PROPERTIES
|
||||
FIXTURES_REQUIRED clear_${EXAMPLE_VARNAME}_cpp_ex
|
||||
ENVIRONMENT "${CROSSCOMPILING_PATH}"
|
||||
)
|
||||
if (last_test)
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_cpp_ex_${testname} PROPERTIES DEPENDS ${last_test})
|
||||
|
||||
@@ -65,7 +65,6 @@ if (H5EXAMPLE_BUILD_TESTING)
|
||||
endif ()
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_cpp_ex_${testname} PROPERTIES
|
||||
FIXTURES_REQUIRED clear_${EXAMPLE_VARNAME}_cpp_ex
|
||||
ENVIRONMENT "${CROSSCOMPILING_PATH}"
|
||||
)
|
||||
if (last_test)
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_cpp_ex_${testname} PROPERTIES DEPENDS ${last_test})
|
||||
|
||||
@@ -49,7 +49,6 @@ if (H5EXAMPLE_BUILD_TESTING)
|
||||
)
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_cpp_ex_${testname} PROPERTIES
|
||||
DEPENDS ${EXAMPLE_VARNAME}_cpp_ex_${testname}-clearall
|
||||
ENVIRONMENT "${CROSSCOMPILING_PATH}"
|
||||
)
|
||||
endif ()
|
||||
if (last_test)
|
||||
|
||||
@@ -1,6 +1,13 @@
|
||||
cmake_minimum_required (VERSION 3.26)
|
||||
PROJECT (HDF5Examples_F90 Fortran)
|
||||
|
||||
# Parallel IO usage requires MPI to be linked and included
|
||||
if (H5_HAVE_PARALLEL)
|
||||
find_package(MPI REQUIRED COMPONENTS Fortran)
|
||||
# Use imported target — carries include dirs, compile flags, and link flags transitively
|
||||
list(APPEND H5EXAMPLE_LINK_Fortran_LIBS MPI::MPI_Fortran)
|
||||
endif ()
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
# Build the Fortran Examples
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
@@ -263,9 +263,6 @@ if (H5EXAMPLE_BUILD_TESTING)
|
||||
-D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}"
|
||||
-P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake"
|
||||
)
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_f90_${testname} PROPERTIES
|
||||
ENVIRONMENT "${CROSSCOMPILING_PATH}"
|
||||
)
|
||||
if (last_test)
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_f90_${testname} PROPERTIES
|
||||
DEPENDS ${last_test}
|
||||
@@ -287,7 +284,6 @@ if (H5EXAMPLE_BUILD_TESTING)
|
||||
)
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_H5DUMP-f90_${testname} PROPERTIES
|
||||
DEPENDS ${last_test}
|
||||
ENVIRONMENT "${CROSSCOMPILING_PATH}"
|
||||
)
|
||||
set (last_test "${EXAMPLE_VARNAME}_H5DUMP-f90_${testname}")
|
||||
endif ()
|
||||
|
||||
@@ -198,7 +198,6 @@ if (H5EXAMPLE_BUILD_TESTING)
|
||||
)
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_f90_${testname}-clean PROPERTIES
|
||||
DEPENDS ${EXAMPLE_VARNAME}_f90_${testname}
|
||||
ENVIRONMENT "${CROSSCOMPILING_PATH}"
|
||||
)
|
||||
else ()
|
||||
add_test (
|
||||
@@ -213,9 +212,6 @@ if (H5EXAMPLE_BUILD_TESTING)
|
||||
-D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}"
|
||||
-P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake"
|
||||
)
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_f90_${testname} PROPERTIES
|
||||
ENVIRONMENT "${CROSSCOMPILING_PATH}"
|
||||
)
|
||||
if (last_test)
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_f90_${testname} PROPERTIES DEPENDS ${last_test})
|
||||
endif ()
|
||||
@@ -235,7 +231,6 @@ if (H5EXAMPLE_BUILD_TESTING)
|
||||
)
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_H5DUMP-f90_${testname} PROPERTIES
|
||||
DEPENDS ${last_test}
|
||||
ENVIRONMENT "${CROSSCOMPILING_PATH}"
|
||||
)
|
||||
set (last_test "${EXAMPLE_VARNAME}_H5DUMP-f90_${testname}")
|
||||
endif ()
|
||||
@@ -269,9 +264,6 @@ if (H5EXAMPLE_BUILD_TESTING)
|
||||
-D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}"
|
||||
-P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake"
|
||||
)
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_f90_${testname} PROPERTIES}
|
||||
ENVIRONMENT "${CROSSCOMPILING_PATH}"
|
||||
)
|
||||
if (last_test)
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_f90_${testname} PROPERTIES DEPENDS ${last_test})
|
||||
endif ()
|
||||
@@ -291,7 +283,6 @@ if (H5EXAMPLE_BUILD_TESTING)
|
||||
)
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_H5DUMP-f90_${testname} PROPERTIES
|
||||
DEPENDS ${last_test}
|
||||
ENVIRONMENT "${CROSSCOMPILING_PATH}"
|
||||
)
|
||||
set (last_test "${EXAMPLE_VARNAME}_H5DUMP-f90_${testname}")
|
||||
endif ()
|
||||
@@ -315,7 +306,6 @@ if (H5EXAMPLE_BUILD_TESTING)
|
||||
add_test (NAME ${EXAMPLE_VARNAME}_f90_${testname} COMMAND $<TARGET_FILE:${EXAMPLE_VARNAME}_f90_${testname}>)
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_f90_${testname} PROPERTIES
|
||||
DEPENDS ${EXAMPLE_VARNAME}_f90_${testname}-clearall
|
||||
ENVIRONMENT "${CROSSCOMPILING_PATH}"
|
||||
)
|
||||
add_test (
|
||||
NAME ${EXAMPLE_VARNAME}_f90_${testname}-clean
|
||||
@@ -352,7 +342,6 @@ if (H5EXAMPLE_BUILD_TESTING)
|
||||
endif ()
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_f90_${testname} PROPERTIES
|
||||
DEPENDS ${EXAMPLE_VARNAME}_f90_${testname}-clearall
|
||||
ENVIRONMENT "${CROSSCOMPILING_PATH}"
|
||||
)
|
||||
if (HDF5_PROVIDES_TOOLS)
|
||||
add_test (
|
||||
@@ -369,7 +358,6 @@ if (H5EXAMPLE_BUILD_TESTING)
|
||||
)
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_H5DUMP-f90_${testname}1 PROPERTIES
|
||||
DEPENDS ${EXAMPLE_VARNAME}_f90_${testname}
|
||||
ENVIRONMENT "${CROSSCOMPILING_PATH}"
|
||||
)
|
||||
add_test (
|
||||
NAME ${EXAMPLE_VARNAME}_H5DUMP-f90_${testname}2
|
||||
@@ -385,7 +373,6 @@ if (H5EXAMPLE_BUILD_TESTING)
|
||||
)
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_H5DUMP-f90_${testname}2 PROPERTIES
|
||||
DEPENDS ${EXAMPLE_VARNAME}_H5DUMP-f90_${testname}1
|
||||
ENVIRONMENT "${CROSSCOMPILING_PATH}"
|
||||
)
|
||||
endif ()
|
||||
endif ()
|
||||
@@ -414,7 +401,6 @@ if (H5EXAMPLE_BUILD_TESTING)
|
||||
endif ()
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_f90_${testname} PROPERTIES
|
||||
DEPENDS ${EXAMPLE_VARNAME}_f90_${testname}-clearall
|
||||
ENVIRONMENT "${CROSSCOMPILING_PATH}"
|
||||
)
|
||||
add_test (
|
||||
NAME ${EXAMPLE_VARNAME}_f90_${testname}-clean
|
||||
|
||||
@@ -30,7 +30,6 @@ foreach (example_name ${examples})
|
||||
"$<$<BOOL:${${EXAMPLE_VARNAME}_USE_114_API}>:-DH5_USE_114_API>"
|
||||
"$<$<BOOL:${${EXAMPLE_VARNAME}_USE_200_API}>:-DH5_USE_200_API>"
|
||||
)
|
||||
target_include_directories (${EXAMPLE_VARNAME}_f90_${example_name} PUBLIC ${MPI_Fortran_INCLUDE_DIRS})
|
||||
target_link_libraries (${EXAMPLE_VARNAME}_f90_${example_name} ${H5EXAMPLE_LINK_Fortran_LIBS})
|
||||
set_target_properties (${EXAMPLE_VARNAME}_f90_${example_name} PROPERTIES LINKER_LANGUAGE Fortran)
|
||||
endforeach ()
|
||||
|
||||
@@ -312,7 +312,6 @@ if (H5EXAMPLE_BUILD_TESTING)
|
||||
)
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_f90_${testname}-clean PROPERTIES
|
||||
DEPENDS ${EXAMPLE_VARNAME}_f90_${testname}
|
||||
ENVIRONMENT "${CROSSCOMPILING_PATH}"
|
||||
)
|
||||
else ()
|
||||
add_test (
|
||||
@@ -327,9 +326,6 @@ if (H5EXAMPLE_BUILD_TESTING)
|
||||
-D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}"
|
||||
-P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake"
|
||||
)
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_f90_${testname} PROPERTIES
|
||||
ENVIRONMENT "${CROSSCOMPILING_PATH}"
|
||||
)
|
||||
if (last_test)
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_f90_${testname} PROPERTIES DEPENDS ${last_test})
|
||||
endif ()
|
||||
@@ -349,7 +345,6 @@ if (H5EXAMPLE_BUILD_TESTING)
|
||||
)
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_H5DUMP-f90_${testname} PROPERTIES
|
||||
DEPENDS ${last_test}
|
||||
ENVIRONMENT "${CROSSCOMPILING_PATH}"
|
||||
)
|
||||
set (last_test "${EXAMPLE_VARNAME}_H5DUMP-f90_${testname}")
|
||||
endif ()
|
||||
@@ -384,7 +379,6 @@ if (H5EXAMPLE_BUILD_TESTING)
|
||||
endif ()
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_f90_${testname} PROPERTIES
|
||||
DEPENDS ${EXAMPLE_VARNAME}_f90_${testname}-clearall
|
||||
ENVIRONMENT "${CROSSCOMPILING_PATH}"
|
||||
)
|
||||
add_test (
|
||||
NAME ${EXAMPLE_VARNAME}_f90_${testname}-clean
|
||||
|
||||
@@ -171,7 +171,6 @@ if (H5EXAMPLE_BUILD_TESTING)
|
||||
)
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_f90_${testname}-clean PROPERTIES
|
||||
DEPENDS ${EXAMPLE_VARNAME}_f90_${testname}
|
||||
ENVIRONMENT "${CROSSCOMPILING_PATH}"
|
||||
)
|
||||
else ()
|
||||
add_test (
|
||||
@@ -186,9 +185,6 @@ if (H5EXAMPLE_BUILD_TESTING)
|
||||
-D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}"
|
||||
-P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake"
|
||||
)
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_f90_${testname} PROPERTIES
|
||||
ENVIRONMENT "${CROSSCOMPILING_PATH}"
|
||||
)
|
||||
if (last_test)
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_f90_${testname} PROPERTIES DEPENDS ${last_test})
|
||||
endif ()
|
||||
@@ -209,7 +205,6 @@ if (H5EXAMPLE_BUILD_TESTING)
|
||||
)
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_H5DUMP-f90_${testname} PROPERTIES
|
||||
DEPENDS ${last_test}
|
||||
ENVIRONMENT "${CROSSCOMPILING_PATH}"
|
||||
)
|
||||
set (last_test "${EXAMPLE_VARNAME}_H5DUMP-f90_${testname}")
|
||||
endif ()
|
||||
|
||||
@@ -106,7 +106,6 @@ if (H5EXAMPLE_BUILD_TESTING)
|
||||
endif ()
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_f90_tutr_${testname} PROPERTIES
|
||||
FIXTURES_REQUIRED clear_${EXAMPLE_VARNAME}_f90_tutr
|
||||
ENVIRONMENT "${CROSSCOMPILING_PATH}"
|
||||
)
|
||||
if (last_test)
|
||||
set_tests_properties (${EXAMPLE_VARNAME}_f90_tutr_${testname} PROPERTIES DEPENDS ${last_test})
|
||||
|
||||
@@ -42,7 +42,6 @@ elseif(MINGW)
|
||||
set (CMAKE_CROSSCOMPILING_EMULATOR wine)
|
||||
|
||||
include_directories(/usr/${TOOLCHAIN_PREFIX}/include)
|
||||
set (CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS On CACHE BOOL "Export windows symbols")
|
||||
else ()
|
||||
set (CMAKE_SYSTEM_NAME Linux)
|
||||
|
||||
|
||||
@@ -25,8 +25,6 @@ set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
|
||||
set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
|
||||
set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
|
||||
set (CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
|
||||
set (CMAKE_CROSSCOMPILING_EMULATOR wine64)
|
||||
set (CROSSCOMPILING_PATH "WINEPATH=/usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/bin/")
|
||||
|
||||
set (CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS On CACHE BOOL "Export windows symbols")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user