Skip to content

Commit 701b46d

Browse files
byrnHDFbyrnHDF
authored
Rename the HDF5Examples build option prefix (#5906)
Renamed all HDF5 examples build options from H5EX_* to H5EXAMPLE_* to better distinguish them from library options when building examples alongside the library. Updated all CMake files, including: Main examples CMakeLists.txt files CMake configuration files in config/ directory CMake preset files Updated documentation files to reflect new option names
1 parent ac169ed commit 701b46d

38 files changed

+453
-450
lines changed

‎HDF5Examples/C/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ add_subdirectory (${PROJECT_SOURCE_DIR}/H5T)
1111

1212
if (${H5_LIBVER_DIR} GREATER 16)
1313
# add_subdirectory (${PROJECT_SOURCE_DIR}/Perf)
14-
if (USE_SHARED_LIBS AND H5EX_BUILD_FILTERS AND HDF5_PROVIDES_PLUGIN_SUPPORT)
14+
if (USE_SHARED_LIBS AND H5EXAMPLE_BUILD_FILTERS AND HDF5_PROVIDES_PLUGIN_SUPPORT)
1515
add_subdirectory (${PROJECT_SOURCE_DIR}/H5FLT)
1616
endif ()
1717
endif ()
@@ -20,12 +20,12 @@ if (${H5_LIBVER_DIR} GREATER 110)
2020
add_subdirectory (${PROJECT_SOURCE_DIR}/H5VDS)
2121
endif ()
2222

23-
if (H5EX_ENABLE_PARALLEL AND H5_HAVE_PARALLEL AND HDF5_PROVIDES_PARALLEL)
23+
if (H5EXAMPLE_ENABLE_PARALLEL AND H5_HAVE_PARALLEL AND HDF5_PROVIDES_PARALLEL)
2424
add_subdirectory (${PROJECT_SOURCE_DIR}/H5PAR)
2525
endif ()
2626

2727
#-- Add High Level Examples
28-
if (H5EX_BUILD_HL AND HDF5_PROVIDES_HL_LIB)
28+
if (H5EXAMPLE_BUILD_HL AND HDF5_PROVIDES_HL_LIB)
2929
add_subdirectory (HL)
3030
endif ()
3131

‎HDF5Examples/C/H5D/CMakeLists.txt‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ foreach (example_name ${common_examples})
2424
if (H5_HAVE_PARALLEL)
2525
target_include_directories (${EXAMPLE_VARNAME}_${example_name} PUBLIC ${MPI_C_INCLUDE_DIRS})
2626
endif ()
27-
target_link_libraries (${EXAMPLE_VARNAME}_${example_name} ${H5EX_HDF5_LINK_LIBS})
28-
if (H5EX_BUILD_TESTING)
27+
target_link_libraries (${EXAMPLE_VARNAME}_${example_name} ${H5EXAMPLE_HDF5_LINK_LIBS})
28+
if (H5EXAMPLE_BUILD_TESTING)
2929
add_custom_command (
3030
TARGET ${EXAMPLE_VARNAME}_${example_name}
3131
POST_BUILD
@@ -50,8 +50,8 @@ if (HDF5_VERSION_MAJOR VERSION_GREATER_EQUAL "1.8")
5050
if (H5_HAVE_PARALLEL)
5151
target_include_directories (${EXAMPLE_VARNAME}_${example_name} PUBLIC ${MPI_C_INCLUDE_DIRS})
5252
endif ()
53-
target_link_libraries (${EXAMPLE_VARNAME}_${example_name} ${H5EX_HDF5_LINK_LIBS})
54-
if (H5EX_BUILD_TESTING)
53+
target_link_libraries (${EXAMPLE_VARNAME}_${example_name} ${H5EXAMPLE_HDF5_LINK_LIBS})
54+
if (H5EXAMPLE_BUILD_TESTING)
5555
add_custom_command (
5656
TARGET ${EXAMPLE_VARNAME}_${example_name}
5757
POST_BUILD
@@ -77,8 +77,8 @@ endif ()
7777
# if (H5_HAVE_PARALLEL)
7878
# target_include_directories (${EXAMPLE_VARNAME}_${example_name} PUBLIC ${MPI_C_INCLUDE_DIRS})
7979
# endif ()
80-
# target_link_libraries (${EXAMPLE_VARNAME}_${example_name} ${H5EX_HDF5_LINK_LIBS})
81-
# if (H5EX_BUILD_TESTING)
80+
# target_link_libraries (${EXAMPLE_VARNAME}_${example_name} ${H5EXAMPLE_HDF5_LINK_LIBS})
81+
# if (H5EXAMPLE_BUILD_TESTING)
8282
# add_custom_command (
8383
# TARGET ${EXAMPLE_VARNAME}_${example_name}
8484
# POST_BUILD
@@ -90,7 +90,7 @@ endif ()
9090
#endif ()
9191
#if (HDF5_VERSION_MAJOR VERSION_GREATER_EQUAL "1.12")
9292
# foreach (example_name ${1_12_examples})
93-
# if (H5EX_BUILD_TESTING)
93+
# if (H5EXAMPLE_BUILD_TESTING)
9494
# add_custom_command (
9595
# TARGET ${EXAMPLE_VARNAME}_${example_name}
9696
# POST_BUILD
@@ -102,7 +102,7 @@ endif ()
102102
#endif ()
103103
#if (HDF5_VERSION_MAJOR VERSION_GREATER_EQUAL "1.14")
104104
# foreach (example_name ${1_14_examples})
105-
# if (H5EX_BUILD_TESTING)
105+
# if (H5EXAMPLE_BUILD_TESTING)
106106
# add_custom_command (
107107
# TARGET ${EXAMPLE_VARNAME}_${example_name}
108108
# POST_BUILD
@@ -114,7 +114,7 @@ endif ()
114114
#endif ()
115115
#if (HDF5_VERSION_MAJOR VERSION_GREATER_EQUAL "2.0")
116116
# foreach (example_name ${2_0_examples})
117-
# if (H5EX_BUILD_TESTING)
117+
# if (H5EXAMPLE_BUILD_TESTING)
118118
# add_custom_command (
119119
# TARGET ${EXAMPLE_VARNAME}_${example_name}
120120
# POST_BUILD
@@ -213,7 +213,7 @@ if (HDF5_PROVIDES_TOOLS)
213213
# endforeach ()
214214
endif ()
215215

216-
if (H5EX_BUILD_TESTING)
216+
if (H5EXAMPLE_BUILD_TESTING)
217217
macro (ADD_H5_TEST testname)
218218
add_test (
219219
NAME ${EXAMPLE_VARNAME}_${testname}-clearall
@@ -236,22 +236,22 @@ if (H5EX_BUILD_TESTING)
236236
-D "TEST_OUTPUT=${testname}.out"
237237
-D "TEST_REFERENCE=${testname}.tst"
238238
-D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}"
239-
-P "${H5EX_RESOURCES_DIR}/runTest.cmake"
239+
-P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake"
240240
)
241241
set_tests_properties (${EXAMPLE_VARNAME}_${testname} PROPERTIES DEPENDS ${EXAMPLE_VARNAME}_${testname}-clearall)
242242
if (HDF5_PROVIDES_TOOLS)
243243
add_test (
244244
NAME ${EXAMPLE_VARNAME}_H5DUMP-${testname}
245245
COMMAND "${CMAKE_COMMAND}"
246246
-D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
247-
-D "TEST_PROGRAM=${H5EX_HDF5_DUMP_EXECUTABLE}"
247+
-D "TEST_PROGRAM=${H5EXAMPLE_HDF5_DUMP_EXECUTABLE}"
248248
-D "TEST_ARGS:STRING=${ARGN};${testname}.h5"
249249
-D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
250250
-D "TEST_OUTPUT=${testname}.ddl.out"
251251
-D "TEST_EXPECT=0"
252252
-D "TEST_REFERENCE=${testname}.ddl"
253253
-D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}"
254-
-P "${H5EX_RESOURCES_DIR}/runTest.cmake"
254+
-P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake"
255255
)
256256
set_tests_properties (${EXAMPLE_VARNAME}_H5DUMP-${testname} PROPERTIES DEPENDS ${EXAMPLE_VARNAME}_${testname})
257257
endif ()

‎HDF5Examples/C/H5FLT/CMakeLists.txt‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -186,13 +186,13 @@ foreach (example ${dyn_examples})
186186
if (H5_HAVE_PARALLEL)
187187
target_include_directories (${EXAMPLE_VARNAME}_${example} PUBLIC ${MPI_C_INCLUDE_DIRS})
188188
endif ()
189-
target_link_libraries (${EXAMPLE_VARNAME}_${example} PRIVATE ${H5EX_HDF5_LINK_LIBS})
189+
target_link_libraries (${EXAMPLE_VARNAME}_${example} PRIVATE ${H5EXAMPLE_HDF5_LINK_LIBS})
190190
if (NOT WIN32)
191191
target_link_libraries (${EXAMPLE_VARNAME}_${example} PRIVATE dl)
192192
endif ()
193193
endforeach ()
194194

195-
if (H5EX_BUILD_TESTING)
195+
if (H5EXAMPLE_BUILD_TESTING)
196196
macro (ADD_H5_TEST testname)
197197
add_test (
198198
NAME ${EXAMPLE_VARNAME}_${testname}-clearall
@@ -221,12 +221,12 @@ if (H5EX_BUILD_TESTING)
221221
-D "TEST_OUTPUT=${testname}.out"
222222
-D "TEST_REFERENCE=${testname}.tst"
223223
-D "TEST_ENV_VAR=HDF5_PLUGIN_PATH"
224-
-D "TEST_ENV_VALUE=${H5EX_HDF5_PLUGIN_PATH}"
224+
-D "TEST_ENV_VALUE=${H5EXAMPLE_HDF5_PLUGIN_PATH}"
225225
-D "TEST_SKIP_COMPARE=1"
226226
-D "TEST_ERRREF=1"
227227
-D "GREP_ERRREF=Filter present but encoding disabled"
228228
-D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}"
229-
-P "${H5EX_RESOURCES_DIR}/runTest.cmake"
229+
-P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake"
230230
)
231231
set_tests_properties (${EXAMPLE_VARNAME}_${testname}-ERR PROPERTIES DEPENDS ${EXAMPLE_VARNAME}_${testname}-clearall)
232232
add_test (
@@ -248,9 +248,9 @@ if (H5EX_BUILD_TESTING)
248248
-D "TEST_OUTPUT=${testname}.out"
249249
-D "TEST_REFERENCE=${testname}.tst"
250250
-D "TEST_ENV_VAR=HDF5_PLUGIN_PATH"
251-
-D "TEST_ENV_VALUE=${H5EX_HDF5_PLUGIN_PATH}"
251+
-D "TEST_ENV_VALUE=${H5EXAMPLE_HDF5_PLUGIN_PATH}"
252252
-D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}"
253-
-P "${H5EX_RESOURCES_DIR}/runTest.cmake"
253+
-P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake"
254254
)
255255
set_tests_properties (${EXAMPLE_VARNAME}_${testname} PROPERTIES DEPENDS ${EXAMPLE_VARNAME}_${testname}-clearall)
256256
endif ()
@@ -261,7 +261,7 @@ if (H5EX_BUILD_TESTING)
261261
NAME ${EXAMPLE_VARNAME}_H5DUMP-${testname}
262262
COMMAND "${CMAKE_COMMAND}"
263263
-D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
264-
-D "TEST_PROGRAM=${H5EX_HDF5_DUMP_EXECUTABLE}"
264+
-D "TEST_PROGRAM=${H5EXAMPLE_HDF5_DUMP_EXECUTABLE}"
265265
-D "TEST_ARGS:STRING=--enable-error-stack;-p;${testname}.h5"
266266
-D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
267267
-D "TEST_OUTPUT=${testname}.ddl.out"
@@ -270,16 +270,16 @@ if (H5EX_BUILD_TESTING)
270270
-D "TEST_EXPECT=0"
271271
-D "TEST_REFERENCE=${testname}.ddl"
272272
-D "TEST_ENV_VAR=HDF5_PLUGIN_PATH"
273-
-D "TEST_ENV_VALUE=${H5EX_HDF5_PLUGIN_PATH}"
273+
-D "TEST_ENV_VALUE=${H5EXAMPLE_HDF5_PLUGIN_PATH}"
274274
-D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}"
275-
-P "${H5EX_RESOURCES_DIR}/runTest.cmake"
275+
-P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake"
276276
)
277277
elseif ("${ARGN}" STREQUAL "FILTERHEADER")
278278
add_test (
279279
NAME ${EXAMPLE_VARNAME}_H5DUMP-${testname}
280280
COMMAND "${CMAKE_COMMAND}"
281281
-D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
282-
-D "TEST_PROGRAM=${H5EX_HDF5_DUMP_EXECUTABLE}"
282+
-D "TEST_PROGRAM=${H5EXAMPLE_HDF5_DUMP_EXECUTABLE}"
283283
-D "TEST_ARGS:STRING=--enable-error-stack;-pH;${testname}.h5"
284284
-D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
285285
-D "TEST_OUTPUT=${testname}.ddl.out"
@@ -288,16 +288,16 @@ if (H5EX_BUILD_TESTING)
288288
-D "TEST_EXPECT=0"
289289
-D "TEST_REFERENCE=${testname}.ddl"
290290
-D "TEST_ENV_VAR=HDF5_PLUGIN_PATH"
291-
-D "TEST_ENV_VALUE=${H5EX_HDF5_PLUGIN_PATH}"
291+
-D "TEST_ENV_VALUE=${H5EXAMPLE_HDF5_PLUGIN_PATH}"
292292
-D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}"
293-
-P "${H5EX_RESOURCES_DIR}/runTest.cmake"
293+
-P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake"
294294
)
295295
else ()
296296
add_test (
297297
NAME ${EXAMPLE_VARNAME}_H5DUMP-${testname}
298298
COMMAND "${CMAKE_COMMAND}"
299299
-D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
300-
-D "TEST_PROGRAM=${H5EX_HDF5_DUMP_EXECUTABLE}"
300+
-D "TEST_PROGRAM=${H5EXAMPLE_HDF5_DUMP_EXECUTABLE}"
301301
-D "TEST_ARGS:STRING=--enable-error-stack;-p;${testname}.h5"
302302
-D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
303303
-D "TEST_OUTPUT=${testname}.ddl.out"
@@ -306,9 +306,9 @@ if (H5EX_BUILD_TESTING)
306306
-D "TEST_EXPECT=0"
307307
-D "TEST_REFERENCE=${testname}.ddl"
308308
-D "TEST_ENV_VAR=HDF5_PLUGIN_PATH"
309-
-D "TEST_ENV_VALUE=${H5EX_HDF5_PLUGIN_PATH}"
309+
-D "TEST_ENV_VALUE=${H5EXAMPLE_HDF5_PLUGIN_PATH}"
310310
-D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}"
311-
-P "${H5EX_RESOURCES_DIR}/runTest.cmake"
311+
-P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake"
312312
)
313313
endif ()
314314
set_tests_properties (${EXAMPLE_VARNAME}_H5DUMP-${testname} PROPERTIES DEPENDS ${EXAMPLE_VARNAME}_${testname})

‎HDF5Examples/C/H5G/CMakeLists.txt‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ foreach (example_name ${common_examples})
2424
if (H5_HAVE_PARALLEL)
2525
target_include_directories (${EXAMPLE_VARNAME}_${example_name} PUBLIC ${MPI_C_INCLUDE_DIRS})
2626
endif ()
27-
target_link_libraries (${EXAMPLE_VARNAME}_${example_name} ${H5EX_HDF5_LINK_LIBS})
28-
if (H5EX_BUILD_TESTING)
27+
target_link_libraries (${EXAMPLE_VARNAME}_${example_name} ${H5EXAMPLE_HDF5_LINK_LIBS})
28+
if (H5EXAMPLE_BUILD_TESTING)
2929
if (NOT ${example_name} STREQUAL "h5ex_g_create")
3030
add_custom_command (
3131
TARGET ${EXAMPLE_VARNAME}_${example_name}
@@ -52,8 +52,8 @@ if (HDF5_VERSION_MAJOR VERSION_GREATER_EQUAL "1.8" AND NOT ${EXAMPLE_VARNAME}_US
5252
if (H5_HAVE_PARALLEL)
5353
target_include_directories (${EXAMPLE_VARNAME}_${example_name} PUBLIC ${MPI_C_INCLUDE_DIRS})
5454
endif ()
55-
target_link_libraries (${EXAMPLE_VARNAME}_${example_name} ${H5EX_HDF5_LINK_LIBS})
56-
if (H5EX_BUILD_TESTING)
55+
target_link_libraries (${EXAMPLE_VARNAME}_${example_name} ${H5EXAMPLE_HDF5_LINK_LIBS})
56+
if (H5EXAMPLE_BUILD_TESTING)
5757
add_custom_command (
5858
TARGET ${EXAMPLE_VARNAME}_${example_name}
5959
POST_BUILD
@@ -79,8 +79,8 @@ endif ()
7979
# if (H5_HAVE_PARALLEL)
8080
# target_include_directories (${EXAMPLE_VARNAME}_${example_name} PUBLIC ${MPI_C_INCLUDE_DIRS})
8181
# endif ()
82-
# target_link_libraries (${EXAMPLE_VARNAME}_${example_name} ${H5EX_HDF5_LINK_LIBS})
83-
# if (H5EX_BUILD_TESTING)
82+
# target_link_libraries (${EXAMPLE_VARNAME}_${example_name} ${H5EXAMPLE_HDF5_LINK_LIBS})
83+
# if (H5EXAMPLE_BUILD_TESTING)
8484
# add_custom_command (
8585
# TARGET ${EXAMPLE_VARNAME}_${example_name}
8686
# POST_BUILD
@@ -92,7 +92,7 @@ endif ()
9292
#endif ()
9393
#if (HDF5_VERSION_MAJOR VERSION_GREATER_EQUAL "1.12")
9494
# foreach (example_name ${1_12_examples})
95-
# if (H5EX_BUILD_TESTING)
95+
# if (H5EXAMPLE_BUILD_TESTING)
9696
# add_custom_command (
9797
# TARGET ${EXAMPLE_VARNAME}_${example_name}
9898
# POST_BUILD
@@ -104,7 +104,7 @@ endif ()
104104
#endif ()
105105
#if (HDF5_VERSION_MAJOR VERSION_GREATER_EQUAL "1.14")
106106
# foreach (example_name ${1_14_examples})
107-
# if (H5EX_BUILD_TESTING)
107+
# if (H5EXAMPLE_BUILD_TESTING)
108108
# add_custom_command (
109109
# TARGET ${EXAMPLE_VARNAME}_${example_name}
110110
# POST_BUILD
@@ -116,7 +116,7 @@ endif ()
116116
#endif ()
117117
#if (HDF5_VERSION_MAJOR VERSION_GREATER_EQUAL "2.0")
118118
# foreach (example_name ${2_0_examples})
119-
# if (H5EX_BUILD_TESTING)
119+
# if (H5EXAMPLE_BUILD_TESTING)
120120
# add_custom_command (
121121
# TARGET ${EXAMPLE_VARNAME}_${example_name}
122122
# POST_BUILD
@@ -207,7 +207,7 @@ if (HDF5_PROVIDES_TOOLS)
207207
# endforeach ()
208208
endif ()
209209

210-
if (H5EX_BUILD_TESTING)
210+
if (H5EXAMPLE_BUILD_TESTING)
211211
set (exfiles
212212
h5ex_g_iterate
213213
h5ex_g_traverse
@@ -248,22 +248,22 @@ if (H5EX_BUILD_TESTING)
248248
-D "TEST_SKIP_COMPARE=TRUE"
249249
-D "TEST_OUTPUT=${testname}.out"
250250
-D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}"
251-
-P "${H5EX_RESOURCES_DIR}/runTest.cmake"
251+
-P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake"
252252
)
253253
set_tests_properties (${EXAMPLE_VARNAME}_${testname} PROPERTIES DEPENDS ${EXAMPLE_VARNAME}_${testname}-clearall)
254254
if (HDF5_PROVIDES_TOOLS)
255255
add_test (
256256
NAME ${EXAMPLE_VARNAME}_H5DUMP-${testname}
257257
COMMAND "${CMAKE_COMMAND}"
258258
-D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
259-
-D "TEST_PROGRAM=${H5EX_HDF5_DUMP_EXECUTABLE}"
259+
-D "TEST_PROGRAM=${H5EXAMPLE_HDF5_DUMP_EXECUTABLE}"
260260
-D "TEST_ARGS:STRING=${ARGN};${testname}.h5"
261261
-D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
262262
-D "TEST_OUTPUT=${testname}.out"
263263
-D "TEST_EXPECT=0"
264264
-D "TEST_REFERENCE=${testname}.ddl"
265265
-D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}"
266-
-P "${H5EX_RESOURCES_DIR}/runTest.cmake"
266+
-P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake"
267267
)
268268
set_tests_properties (${EXAMPLE_VARNAME}_H5DUMP-${testname} PROPERTIES DEPENDS ${EXAMPLE_VARNAME}_${testname})
269269
endif ()
@@ -286,21 +286,21 @@ if (H5EX_BUILD_TESTING)
286286
-D "TEST_OUTPUT=${testname}.out"
287287
-D "TEST_REFERENCE=${testname}.tst"
288288
-D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}"
289-
-P "${H5EX_RESOURCES_DIR}/runTest.cmake"
289+
-P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake"
290290
)
291291
if (HDF5_PROVIDES_TOOLS)
292292
add_test (
293293
NAME ${EXAMPLE_VARNAME}_H5DUMP-${testname}
294294
COMMAND "${CMAKE_COMMAND}"
295295
-D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
296-
-D "TEST_PROGRAM=${H5EX_HDF5_DUMP_EXECUTABLE}"
296+
-D "TEST_PROGRAM=${H5EXAMPLE_HDF5_DUMP_EXECUTABLE}"
297297
-D "TEST_ARGS:STRING=${ARGN};${testname}.h5"
298298
-D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
299299
-D "TEST_OUTPUT=${testname}.ddl.out"
300300
-D "TEST_EXPECT=0"
301301
-D "TEST_REFERENCE=${testname}.ddl"
302302
-D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}"
303-
-P "${H5EX_RESOURCES_DIR}/runTest.cmake"
303+
-P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake"
304304
)
305305
set_tests_properties (${EXAMPLE_VARNAME}_H5DUMP-${testname} PROPERTIES DEPENDS ${EXAMPLE_VARNAME}_${testname})
306306
endif ()
@@ -330,36 +330,36 @@ if (H5EX_BUILD_TESTING)
330330
-D "TEST_OUTPUT=${testname}.out"
331331
-D "TEST_REFERENCE=${testname}.tst"
332332
-D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}"
333-
-P "${H5EX_RESOURCES_DIR}/runTest.cmake"
333+
-P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake"
334334
)
335335
set_tests_properties (${EXAMPLE_VARNAME}_${testname} PROPERTIES DEPENDS ${EXAMPLE_VARNAME}_${testname}-clearall)
336336
if (HDF5_PROVIDES_TOOLS)
337337
add_test (
338338
NAME ${EXAMPLE_VARNAME}_H5DUMP-${testname}1
339339
COMMAND "${CMAKE_COMMAND}"
340340
-D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
341-
-D "TEST_PROGRAM=${H5EX_HDF5_DUMP_EXECUTABLE}"
341+
-D "TEST_PROGRAM=${H5EXAMPLE_HDF5_DUMP_EXECUTABLE}"
342342
-D "TEST_ARGS:STRING=${testname}1.h5"
343343
-D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
344344
-D "TEST_OUTPUT=${testname}1.ddl.out"
345345
-D "TEST_EXPECT=0"
346346
-D "TEST_REFERENCE=${testname}1.ddl"
347347
-D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}"
348-
-P "${H5EX_RESOURCES_DIR}/runTest.cmake"
348+
-P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake"
349349
)
350350
set_tests_properties (${EXAMPLE_VARNAME}_H5DUMP-${testname}1 PROPERTIES DEPENDS ${EXAMPLE_VARNAME}_${testname})
351351
add_test (
352352
NAME ${EXAMPLE_VARNAME}_H5DUMP-${testname}2
353353
COMMAND "${CMAKE_COMMAND}"
354354
-D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}"
355-
-D "TEST_PROGRAM=${H5EX_HDF5_DUMP_EXECUTABLE}"
355+
-D "TEST_PROGRAM=${H5EXAMPLE_HDF5_DUMP_EXECUTABLE}"
356356
-D "TEST_ARGS:STRING=${testname}2.h5"
357357
-D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
358358
-D "TEST_OUTPUT=${testname}2.ddl.out"
359359
-D "TEST_EXPECT=0"
360360
-D "TEST_REFERENCE=${testname}2.ddl"
361361
-D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}"
362-
-P "${H5EX_RESOURCES_DIR}/runTest.cmake"
362+
-P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake"
363363
)
364364
set_tests_properties (${EXAMPLE_VARNAME}_H5DUMP-${testname}2 PROPERTIES DEPENDS ${EXAMPLE_VARNAME}_H5DUMP-${testname}1)
365365
endif ()
@@ -388,7 +388,7 @@ if (H5EX_BUILD_TESTING)
388388
-D "TEST_OUTPUT=${testname}.out"
389389
-D "TEST_REFERENCE=${testname}.tst"
390390
-D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}"
391-
-P "${H5EX_RESOURCES_DIR}/runTest.cmake"
391+
-P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake"
392392
)
393393
set_tests_properties (${EXAMPLE_VARNAME}_${testname} PROPERTIES DEPENDS ${EXAMPLE_VARNAME}_${testname}-clearall)
394394
endif ()

0 commit comments

Comments
 (0)