From 4cade2135ea632c89a22130360fa4823d73dd4c9 Mon Sep 17 00:00:00 2001 From: "M. Scot Breitenfeld" Date: Tue, 19 Dec 2023 17:39:58 -0600 Subject: [PATCH] updated files --- HDF5Examples/FORTRAN/H5G/CMakeLists.txt | 20 +++++++++----- .../FORTRAN/H5G/Fortran_sourcefiles.cmake | 26 ++++++++++++++----- 2 files changed, 33 insertions(+), 13 deletions(-) diff --git a/HDF5Examples/FORTRAN/H5G/CMakeLists.txt b/HDF5Examples/FORTRAN/H5G/CMakeLists.txt index 4a84b914ddf..bae4d34161e 100644 --- a/HDF5Examples/FORTRAN/H5G/CMakeLists.txt +++ b/HDF5Examples/FORTRAN/H5G/CMakeLists.txt @@ -349,11 +349,19 @@ if (H5EX_BUILD_TESTING) ADD_DUMP_TEST (h5ex_g_create) ADD_H5_CMP_TEST (h5ex_g_corder) ADD_H5_CMP_TEST (h5ex_g_phase) -# if (HDF_ENABLE_F2003) -# ADD_H5_CMP_TEST (h5ex_g_intermediate) -# ADD_H5_CMP_TEST (h5ex_g_iterate) -# ADD_H5_CMP_TEST (h5ex_g_traverse) - ADD_H5_CMP_TEST (h5ex_g_visit) -# endif () + + if (HDF5_VERSION_STRING VERSION_GREATER_EQUAL "1.10.0") + ADD_H5_CMP_TEST (h5ex_g_intermediate) + ADD_H5_CMP_TEST (h5ex_g_iterate) + ADD_H5_CMP_TEST (h5ex_g_traverse) + ADD_H5_CMP_TEST (h5ex_g_visit) + else () + if (HDF_ENABLE_F2003) + ADD_H5_CMP_TEST (h5ex_g_intermediate) + ADD_H5_CMP_TEST (h5ex_g_iterate) + ADD_H5_CMP_TEST (h5ex_g_traverse) + ADD_H5_CMP_TEST (h5ex_g_visit) + endif () + endif () endif () diff --git a/HDF5Examples/FORTRAN/H5G/Fortran_sourcefiles.cmake b/HDF5Examples/FORTRAN/H5G/Fortran_sourcefiles.cmake index 272e5988946..bd44ecdcbea 100644 --- a/HDF5Examples/FORTRAN/H5G/Fortran_sourcefiles.cmake +++ b/HDF5Examples/FORTRAN/H5G/Fortran_sourcefiles.cmake @@ -8,11 +8,23 @@ set (common_examples h5ex_g_corder h5ex_g_phase h5ex_g_create - h5ex_g_visit_F03 ) - -#set (f03_examples -# h5ex_g_iterate_F03 -# h5ex_g_traverse_F03 -# h5ex_g_visit_F03 -#) +if (HDF5_VERSION_STRING VERSION_GREATER_EQUAL "1.10.0") + set (common_examples + ${common_examples} + h5ex_g_intermediate + h5ex_g_iterate + h5ex_g_traverse + h5ex_g_visit + ) +else () + if (HDF_ENABLE_F2003) + set (common_examples + ${common_examples} + h5ex_g_intermediate + h5ex_g_iterate + h5ex_g_traverse + h5ex_g_visit + ) + endif () +endif ()