summaryrefslogtreecommitdiffstats
path: root/HDF5Examples/C
diff options
context:
space:
mode:
Diffstat (limited to 'HDF5Examples/C')
-rw-r--r--HDF5Examples/C/H5D/C_sourcefiles.cmake17
-rw-r--r--HDF5Examples/C/H5G/CMakeLists.txt2
-rw-r--r--HDF5Examples/C/H5G/C_sourcefiles.cmake18
-rw-r--r--HDF5Examples/C/H5T/16/h5ex_t_objrefatt.c1
-rw-r--r--HDF5Examples/C/H5T/CMakeLists.txt43
-rw-r--r--HDF5Examples/C/H5T/tfiles/16/114/h5ex_t_vlenatt.ddl18
6 files changed, 75 insertions, 24 deletions
diff --git a/HDF5Examples/C/H5D/C_sourcefiles.cmake b/HDF5Examples/C/H5D/C_sourcefiles.cmake
index 65c19a0..87e0d6f 100644
--- a/HDF5Examples/C/H5D/C_sourcefiles.cmake
+++ b/HDF5Examples/C/H5D/C_sourcefiles.cmake
@@ -30,9 +30,14 @@ if (HDF5_ENABLE_SZIP_SUPPORT)
)
endif ()
-set (1_8_examples
- h5ex_d_nbit
- h5ex_d_sofloat
- h5ex_d_soint
- h5ex_d_transform
-)
+if (HDF5_VERSION_MAJOR VERSION_GREATER_EQUAL "1.8" AND NOT ${${EXAMPLE_VARNAME}_USE_16_API})
+ set (1_8_examples
+ h5ex_d_nbit
+ h5ex_d_sofloat
+ h5ex_d_soint
+ h5ex_d_transform
+ )
+else ()
+ set (1_8_examples)
+endif ()
+
diff --git a/HDF5Examples/C/H5G/CMakeLists.txt b/HDF5Examples/C/H5G/CMakeLists.txt
index 9aca9e7..afef556 100644
--- a/HDF5Examples/C/H5G/CMakeLists.txt
+++ b/HDF5Examples/C/H5G/CMakeLists.txt
@@ -139,7 +139,7 @@ if (HDF5_BUILD_TOOLS)
endif ()
endforeach ()
- if (HDF5_VERSION_MAJOR VERSION_GREATER_EQUAL "1.8")
+ if (HDF5_VERSION_MAJOR VERSION_GREATER_EQUAL "1.8" AND NOT ${${EXAMPLE_VARNAME}_USE_16_API})
add_custom_command (
TARGET ${EXAMPLE_VARNAME}_h5ex_g_compact
POST_BUILD
diff --git a/HDF5Examples/C/H5G/C_sourcefiles.cmake b/HDF5Examples/C/H5G/C_sourcefiles.cmake
index 155453c..133fb43 100644
--- a/HDF5Examples/C/H5G/C_sourcefiles.cmake
+++ b/HDF5Examples/C/H5G/C_sourcefiles.cmake
@@ -9,10 +9,14 @@ set (common_examples
h5ex_g_traverse
)
-set (1_8_examples
- h5ex_g_compact
- h5ex_g_corder
- h5ex_g_phase
- h5ex_g_intermediate
- h5ex_g_visit
-)
+if (HDF5_VERSION_MAJOR VERSION_GREATER_EQUAL "1.8" AND NOT ${${EXAMPLE_VARNAME}_USE_16_API})
+ set (1_8_examples
+ h5ex_g_compact
+ h5ex_g_corder
+ h5ex_g_phase
+ h5ex_g_intermediate
+ h5ex_g_visit
+ )
+else ()
+ set (1_8_examples)
+endif ()
diff --git a/HDF5Examples/C/H5T/16/h5ex_t_objrefatt.c b/HDF5Examples/C/H5T/16/h5ex_t_objrefatt.c
index 95d86dc..85c0448 100644
--- a/HDF5Examples/C/H5T/16/h5ex_t_objrefatt.c
+++ b/HDF5Examples/C/H5T/16/h5ex_t_objrefatt.c
@@ -27,6 +27,7 @@ main(void)
hid_t space; /* Dataspace Handle */
hid_t dset; /* Dataset Handle */
hid_t obj; /* Object Handle */
+ hid_t attr; /* Attribute Handle */
herr_t status;
hsize_t dims[1] = {DIM0};
hobj_ref_t wdata[DIM0]; /* Write buffer */
diff --git a/HDF5Examples/C/H5T/CMakeLists.txt b/HDF5Examples/C/H5T/CMakeLists.txt
index 4673562..4dcf6cb 100644
--- a/HDF5Examples/C/H5T/CMakeLists.txt
+++ b/HDF5Examples/C/H5T/CMakeLists.txt
@@ -113,21 +113,29 @@ endforeach ()
if (HDF5_BUILD_TOOLS)
foreach (example_name ${common_examples})
if (NOT ${example_name} STREQUAL "h5ex_t_convert")
- if (HDF5_VERSION_MAJOR VERSION_EQUAL "1.6")
- add_custom_command (
- TARGET ${EXAMPLE_VARNAME}_${example_name}
- POST_BUILD
- COMMAND ${CMAKE_COMMAND}
- ARGS -E copy_if_different ${PROJECT_SOURCE_DIR}/tfiles/16/${example_name}.ddl ${PROJECT_BINARY_DIR}/${example_name}.ddl
- )
- else ()
if (${example_name} STREQUAL "h5ex_t_vlen" OR ${example_name} STREQUAL "h5ex_t_vlenatt")
if (HDF5_VERSION_STRING VERSION_GREATER_EQUAL "1.14.3")
+ if (${H5_LIBVER_DIR} EQUAL 16 AND ${example_name} STREQUAL "h5ex_t_vlenatt")
+ add_custom_command (
+ TARGET ${EXAMPLE_VARNAME}_${example_name}
+ POST_BUILD
+ COMMAND ${CMAKE_COMMAND}
+ ARGS -E copy_if_different ${PROJECT_SOURCE_DIR}/tfiles/16/114/${example_name}.ddl ${PROJECT_BINARY_DIR}/${example_name}.ddl
+ )
+ else ()
+ add_custom_command (
+ TARGET ${EXAMPLE_VARNAME}_${example_name}
+ POST_BUILD
+ COMMAND ${CMAKE_COMMAND}
+ ARGS -E copy_if_different ${PROJECT_SOURCE_DIR}/tfiles/114/${example_name}.ddl ${example_name}.ddl
+ )
+ endif ()
+ elseif (${H5_LIBVER_DIR} EQUAL 16)
add_custom_command (
TARGET ${EXAMPLE_VARNAME}_${example_name}
POST_BUILD
COMMAND ${CMAKE_COMMAND}
- ARGS -E copy_if_different ${PROJECT_SOURCE_DIR}/tfiles/114/${example_name}.ddl ${example_name}.ddl
+ ARGS -E copy_if_different ${PROJECT_SOURCE_DIR}/tfiles/16/${example_name}.ddl ${PROJECT_BINARY_DIR}/${example_name}.ddl
)
else ()
add_custom_command (
@@ -172,12 +180,21 @@ if (HDF5_BUILD_TOOLS)
)
endif ()
elseif (HDF5_VERSION_MAJOR VERSION_GREATER_EQUAL "1.12")
+ if (${H5_LIBVER_DIR} EQUAL 16)
+ add_custom_command (
+ TARGET ${EXAMPLE_VARNAME}_${example_name}
+ POST_BUILD
+ COMMAND ${CMAKE_COMMAND}
+ ARGS -E copy_if_different ${PROJECT_SOURCE_DIR}/tfiles/16/112/${example_name}.ddl ${PROJECT_BINARY_DIR}/${example_name}.ddl
+ )
+ else ()
add_custom_command (
TARGET ${EXAMPLE_VARNAME}_${example_name}
POST_BUILD
COMMAND ${CMAKE_COMMAND}
ARGS -E copy_if_different ${PROJECT_SOURCE_DIR}/tfiles/18/112/${example_name}.ddl ${example_name}.ddl
)
+ endif ()
else ()
add_custom_command (
TARGET ${EXAMPLE_VARNAME}_${example_name}
@@ -235,6 +252,13 @@ if (HDF5_BUILD_TOOLS)
)
endif ()
endif ()
+ elseif (${H5_LIBVER_DIR} EQUAL 16)
+ add_custom_command (
+ TARGET ${EXAMPLE_VARNAME}_${example_name}
+ POST_BUILD
+ COMMAND ${CMAKE_COMMAND}
+ ARGS -E copy_if_different ${PROJECT_SOURCE_DIR}/tfiles/16/${example_name}.ddl ${PROJECT_BINARY_DIR}/${example_name}.ddl
+ )
else ()
add_custom_command (
TARGET ${EXAMPLE_VARNAME}_${example_name}
@@ -244,7 +268,6 @@ if (HDF5_BUILD_TOOLS)
)
endif ()
endif ()
- endif ()
endforeach ()
# foreach (example_name ${1_8_examples})
diff --git a/HDF5Examples/C/H5T/tfiles/16/114/h5ex_t_vlenatt.ddl b/HDF5Examples/C/H5T/tfiles/16/114/h5ex_t_vlenatt.ddl
new file mode 100644
index 0000000..7bd321b
--- /dev/null
+++ b/HDF5Examples/C/H5T/tfiles/16/114/h5ex_t_vlenatt.ddl
@@ -0,0 +1,18 @@
+HDF5 "h5ex_t_vlenatt.h5" {
+GROUP "/" {
+ DATASET "DS1" {
+ DATATYPE H5T_STD_I32LE
+ DATASPACE SCALAR
+ DATA {
+ (0): 0
+ }
+ ATTRIBUTE "A1" {
+ DATATYPE H5T_VLEN { H5T_STD_I32LE }
+ DATASPACE SIMPLE { ( 2 ) / ( 2 ) }
+ DATA {
+ (0): (3, 2, 1), (1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144)
+ }
+ }
+ }
+}
+}
generated by cgit v0.12 at 2024-07-17 02:51:12 (GMT)