diff --git a/HDF5Examples/C/CMakeLists.txt b/HDF5Examples/C/CMakeLists.txt index 6a32664a348..1cb11c73378 100644 --- a/HDF5Examples/C/CMakeLists.txt +++ b/HDF5Examples/C/CMakeLists.txt @@ -11,7 +11,7 @@ add_subdirectory (${PROJECT_SOURCE_DIR}/H5T) if (${H5_LIBVER_DIR} GREATER 16) # add_subdirectory (${PROJECT_SOURCE_DIR}/Perf) - if (USE_SHARED_LIBS AND H5EX_BUILD_FILTERS AND HDF5_PROVIDES_PLUGIN_SUPPORT) + if (USE_SHARED_LIBS AND H5EXAMPLE_BUILD_FILTERS AND HDF5_PROVIDES_PLUGIN_SUPPORT) add_subdirectory (${PROJECT_SOURCE_DIR}/H5FLT) endif () endif () @@ -20,12 +20,12 @@ if (${H5_LIBVER_DIR} GREATER 110) add_subdirectory (${PROJECT_SOURCE_DIR}/H5VDS) endif () -if (H5EX_ENABLE_PARALLEL AND H5_HAVE_PARALLEL AND HDF5_PROVIDES_PARALLEL) +if (H5EXAMPLE_ENABLE_PARALLEL AND H5_HAVE_PARALLEL AND HDF5_PROVIDES_PARALLEL) add_subdirectory (${PROJECT_SOURCE_DIR}/H5PAR) endif () #-- Add High Level Examples -if (H5EX_BUILD_HL AND HDF5_PROVIDES_HL_LIB) +if (H5EXAMPLE_BUILD_HL AND HDF5_PROVIDES_HL_LIB) add_subdirectory (HL) endif () diff --git a/HDF5Examples/C/H5D/CMakeLists.txt b/HDF5Examples/C/H5D/CMakeLists.txt index e01b4d3b96f..9303658e877 100644 --- a/HDF5Examples/C/H5D/CMakeLists.txt +++ b/HDF5Examples/C/H5D/CMakeLists.txt @@ -24,8 +24,8 @@ foreach (example_name ${common_examples}) if (H5_HAVE_PARALLEL) target_include_directories (${EXAMPLE_VARNAME}_${example_name} PUBLIC ${MPI_C_INCLUDE_DIRS}) endif () - target_link_libraries (${EXAMPLE_VARNAME}_${example_name} ${H5EX_HDF5_LINK_LIBS}) - if (H5EX_BUILD_TESTING) + target_link_libraries (${EXAMPLE_VARNAME}_${example_name} ${H5EXAMPLE_HDF5_LINK_LIBS}) + if (H5EXAMPLE_BUILD_TESTING) add_custom_command ( TARGET ${EXAMPLE_VARNAME}_${example_name} POST_BUILD @@ -50,8 +50,8 @@ if (HDF5_VERSION_MAJOR VERSION_GREATER_EQUAL "1.8") if (H5_HAVE_PARALLEL) target_include_directories (${EXAMPLE_VARNAME}_${example_name} PUBLIC ${MPI_C_INCLUDE_DIRS}) endif () - target_link_libraries (${EXAMPLE_VARNAME}_${example_name} ${H5EX_HDF5_LINK_LIBS}) - if (H5EX_BUILD_TESTING) + target_link_libraries (${EXAMPLE_VARNAME}_${example_name} ${H5EXAMPLE_HDF5_LINK_LIBS}) + if (H5EXAMPLE_BUILD_TESTING) add_custom_command ( TARGET ${EXAMPLE_VARNAME}_${example_name} POST_BUILD @@ -77,8 +77,8 @@ endif () # if (H5_HAVE_PARALLEL) # target_include_directories (${EXAMPLE_VARNAME}_${example_name} PUBLIC ${MPI_C_INCLUDE_DIRS}) # endif () -# target_link_libraries (${EXAMPLE_VARNAME}_${example_name} ${H5EX_HDF5_LINK_LIBS}) -# if (H5EX_BUILD_TESTING) +# target_link_libraries (${EXAMPLE_VARNAME}_${example_name} ${H5EXAMPLE_HDF5_LINK_LIBS}) +# if (H5EXAMPLE_BUILD_TESTING) # add_custom_command ( # TARGET ${EXAMPLE_VARNAME}_${example_name} # POST_BUILD @@ -90,7 +90,7 @@ endif () #endif () #if (HDF5_VERSION_MAJOR VERSION_GREATER_EQUAL "1.12") # foreach (example_name ${1_12_examples}) -# if (H5EX_BUILD_TESTING) +# if (H5EXAMPLE_BUILD_TESTING) # add_custom_command ( # TARGET ${EXAMPLE_VARNAME}_${example_name} # POST_BUILD @@ -102,7 +102,7 @@ endif () #endif () #if (HDF5_VERSION_MAJOR VERSION_GREATER_EQUAL "1.14") # foreach (example_name ${1_14_examples}) -# if (H5EX_BUILD_TESTING) +# if (H5EXAMPLE_BUILD_TESTING) # add_custom_command ( # TARGET ${EXAMPLE_VARNAME}_${example_name} # POST_BUILD @@ -114,7 +114,7 @@ endif () #endif () #if (HDF5_VERSION_MAJOR VERSION_GREATER_EQUAL "2.0") # foreach (example_name ${2_0_examples}) -# if (H5EX_BUILD_TESTING) +# if (H5EXAMPLE_BUILD_TESTING) # add_custom_command ( # TARGET ${EXAMPLE_VARNAME}_${example_name} # POST_BUILD @@ -213,7 +213,7 @@ if (HDF5_PROVIDES_TOOLS) # endforeach () endif () -if (H5EX_BUILD_TESTING) +if (H5EXAMPLE_BUILD_TESTING) macro (ADD_H5_TEST testname) add_test ( NAME ${EXAMPLE_VARNAME}_${testname}-clearall @@ -236,7 +236,7 @@ if (H5EX_BUILD_TESTING) -D "TEST_OUTPUT=${testname}.out" -D "TEST_REFERENCE=${testname}.tst" -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) set_tests_properties (${EXAMPLE_VARNAME}_${testname} PROPERTIES DEPENDS ${EXAMPLE_VARNAME}_${testname}-clearall) if (HDF5_PROVIDES_TOOLS) @@ -244,14 +244,14 @@ if (H5EX_BUILD_TESTING) NAME ${EXAMPLE_VARNAME}_H5DUMP-${testname} COMMAND "${CMAKE_COMMAND}" -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}" - -D "TEST_PROGRAM=${H5EX_HDF5_DUMP_EXECUTABLE}" + -D "TEST_PROGRAM=${H5EXAMPLE_HDF5_DUMP_EXECUTABLE}" -D "TEST_ARGS:STRING=${ARGN};${testname}.h5" -D "TEST_FOLDER=${PROJECT_BINARY_DIR}" -D "TEST_OUTPUT=${testname}.ddl.out" -D "TEST_EXPECT=0" -D "TEST_REFERENCE=${testname}.ddl" -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) set_tests_properties (${EXAMPLE_VARNAME}_H5DUMP-${testname} PROPERTIES DEPENDS ${EXAMPLE_VARNAME}_${testname}) endif () diff --git a/HDF5Examples/C/H5FLT/CMakeLists.txt b/HDF5Examples/C/H5FLT/CMakeLists.txt index fde88e0c5dd..b4b41fcbb77 100644 --- a/HDF5Examples/C/H5FLT/CMakeLists.txt +++ b/HDF5Examples/C/H5FLT/CMakeLists.txt @@ -186,13 +186,13 @@ foreach (example ${dyn_examples}) if (H5_HAVE_PARALLEL) target_include_directories (${EXAMPLE_VARNAME}_${example} PUBLIC ${MPI_C_INCLUDE_DIRS}) endif () - target_link_libraries (${EXAMPLE_VARNAME}_${example} PRIVATE ${H5EX_HDF5_LINK_LIBS}) + target_link_libraries (${EXAMPLE_VARNAME}_${example} PRIVATE ${H5EXAMPLE_HDF5_LINK_LIBS}) if (NOT WIN32) target_link_libraries (${EXAMPLE_VARNAME}_${example} PRIVATE dl) endif () endforeach () -if (H5EX_BUILD_TESTING) +if (H5EXAMPLE_BUILD_TESTING) macro (ADD_H5_TEST testname) add_test ( NAME ${EXAMPLE_VARNAME}_${testname}-clearall @@ -221,12 +221,12 @@ if (H5EX_BUILD_TESTING) -D "TEST_OUTPUT=${testname}.out" -D "TEST_REFERENCE=${testname}.tst" -D "TEST_ENV_VAR=HDF5_PLUGIN_PATH" - -D "TEST_ENV_VALUE=${H5EX_HDF5_PLUGIN_PATH}" + -D "TEST_ENV_VALUE=${H5EXAMPLE_HDF5_PLUGIN_PATH}" -D "TEST_SKIP_COMPARE=1" -D "TEST_ERRREF=1" -D "GREP_ERRREF=Filter present but encoding disabled" -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) set_tests_properties (${EXAMPLE_VARNAME}_${testname}-ERR PROPERTIES DEPENDS ${EXAMPLE_VARNAME}_${testname}-clearall) add_test ( @@ -248,9 +248,9 @@ if (H5EX_BUILD_TESTING) -D "TEST_OUTPUT=${testname}.out" -D "TEST_REFERENCE=${testname}.tst" -D "TEST_ENV_VAR=HDF5_PLUGIN_PATH" - -D "TEST_ENV_VALUE=${H5EX_HDF5_PLUGIN_PATH}" + -D "TEST_ENV_VALUE=${H5EXAMPLE_HDF5_PLUGIN_PATH}" -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) set_tests_properties (${EXAMPLE_VARNAME}_${testname} PROPERTIES DEPENDS ${EXAMPLE_VARNAME}_${testname}-clearall) endif () @@ -261,7 +261,7 @@ if (H5EX_BUILD_TESTING) NAME ${EXAMPLE_VARNAME}_H5DUMP-${testname} COMMAND "${CMAKE_COMMAND}" -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}" - -D "TEST_PROGRAM=${H5EX_HDF5_DUMP_EXECUTABLE}" + -D "TEST_PROGRAM=${H5EXAMPLE_HDF5_DUMP_EXECUTABLE}" -D "TEST_ARGS:STRING=--enable-error-stack;-p;${testname}.h5" -D "TEST_FOLDER=${PROJECT_BINARY_DIR}" -D "TEST_OUTPUT=${testname}.ddl.out" @@ -270,16 +270,16 @@ if (H5EX_BUILD_TESTING) -D "TEST_EXPECT=0" -D "TEST_REFERENCE=${testname}.ddl" -D "TEST_ENV_VAR=HDF5_PLUGIN_PATH" - -D "TEST_ENV_VALUE=${H5EX_HDF5_PLUGIN_PATH}" + -D "TEST_ENV_VALUE=${H5EXAMPLE_HDF5_PLUGIN_PATH}" -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) elseif ("${ARGN}" STREQUAL "FILTERHEADER") add_test ( NAME ${EXAMPLE_VARNAME}_H5DUMP-${testname} COMMAND "${CMAKE_COMMAND}" -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}" - -D "TEST_PROGRAM=${H5EX_HDF5_DUMP_EXECUTABLE}" + -D "TEST_PROGRAM=${H5EXAMPLE_HDF5_DUMP_EXECUTABLE}" -D "TEST_ARGS:STRING=--enable-error-stack;-pH;${testname}.h5" -D "TEST_FOLDER=${PROJECT_BINARY_DIR}" -D "TEST_OUTPUT=${testname}.ddl.out" @@ -288,16 +288,16 @@ if (H5EX_BUILD_TESTING) -D "TEST_EXPECT=0" -D "TEST_REFERENCE=${testname}.ddl" -D "TEST_ENV_VAR=HDF5_PLUGIN_PATH" - -D "TEST_ENV_VALUE=${H5EX_HDF5_PLUGIN_PATH}" + -D "TEST_ENV_VALUE=${H5EXAMPLE_HDF5_PLUGIN_PATH}" -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) else () add_test ( NAME ${EXAMPLE_VARNAME}_H5DUMP-${testname} COMMAND "${CMAKE_COMMAND}" -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}" - -D "TEST_PROGRAM=${H5EX_HDF5_DUMP_EXECUTABLE}" + -D "TEST_PROGRAM=${H5EXAMPLE_HDF5_DUMP_EXECUTABLE}" -D "TEST_ARGS:STRING=--enable-error-stack;-p;${testname}.h5" -D "TEST_FOLDER=${PROJECT_BINARY_DIR}" -D "TEST_OUTPUT=${testname}.ddl.out" @@ -306,9 +306,9 @@ if (H5EX_BUILD_TESTING) -D "TEST_EXPECT=0" -D "TEST_REFERENCE=${testname}.ddl" -D "TEST_ENV_VAR=HDF5_PLUGIN_PATH" - -D "TEST_ENV_VALUE=${H5EX_HDF5_PLUGIN_PATH}" + -D "TEST_ENV_VALUE=${H5EXAMPLE_HDF5_PLUGIN_PATH}" -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) endif () set_tests_properties (${EXAMPLE_VARNAME}_H5DUMP-${testname} PROPERTIES DEPENDS ${EXAMPLE_VARNAME}_${testname}) diff --git a/HDF5Examples/C/H5G/CMakeLists.txt b/HDF5Examples/C/H5G/CMakeLists.txt index 59a0c77f96d..f53b3da210b 100644 --- a/HDF5Examples/C/H5G/CMakeLists.txt +++ b/HDF5Examples/C/H5G/CMakeLists.txt @@ -24,8 +24,8 @@ foreach (example_name ${common_examples}) if (H5_HAVE_PARALLEL) target_include_directories (${EXAMPLE_VARNAME}_${example_name} PUBLIC ${MPI_C_INCLUDE_DIRS}) endif () - target_link_libraries (${EXAMPLE_VARNAME}_${example_name} ${H5EX_HDF5_LINK_LIBS}) - if (H5EX_BUILD_TESTING) + target_link_libraries (${EXAMPLE_VARNAME}_${example_name} ${H5EXAMPLE_HDF5_LINK_LIBS}) + if (H5EXAMPLE_BUILD_TESTING) if (NOT ${example_name} STREQUAL "h5ex_g_create") add_custom_command ( TARGET ${EXAMPLE_VARNAME}_${example_name} @@ -52,8 +52,8 @@ if (HDF5_VERSION_MAJOR VERSION_GREATER_EQUAL "1.8" AND NOT ${EXAMPLE_VARNAME}_US if (H5_HAVE_PARALLEL) target_include_directories (${EXAMPLE_VARNAME}_${example_name} PUBLIC ${MPI_C_INCLUDE_DIRS}) endif () - target_link_libraries (${EXAMPLE_VARNAME}_${example_name} ${H5EX_HDF5_LINK_LIBS}) - if (H5EX_BUILD_TESTING) + target_link_libraries (${EXAMPLE_VARNAME}_${example_name} ${H5EXAMPLE_HDF5_LINK_LIBS}) + if (H5EXAMPLE_BUILD_TESTING) add_custom_command ( TARGET ${EXAMPLE_VARNAME}_${example_name} POST_BUILD @@ -79,8 +79,8 @@ endif () # if (H5_HAVE_PARALLEL) # target_include_directories (${EXAMPLE_VARNAME}_${example_name} PUBLIC ${MPI_C_INCLUDE_DIRS}) # endif () -# target_link_libraries (${EXAMPLE_VARNAME}_${example_name} ${H5EX_HDF5_LINK_LIBS}) -# if (H5EX_BUILD_TESTING) +# target_link_libraries (${EXAMPLE_VARNAME}_${example_name} ${H5EXAMPLE_HDF5_LINK_LIBS}) +# if (H5EXAMPLE_BUILD_TESTING) # add_custom_command ( # TARGET ${EXAMPLE_VARNAME}_${example_name} # POST_BUILD @@ -92,7 +92,7 @@ endif () #endif () #if (HDF5_VERSION_MAJOR VERSION_GREATER_EQUAL "1.12") # foreach (example_name ${1_12_examples}) -# if (H5EX_BUILD_TESTING) +# if (H5EXAMPLE_BUILD_TESTING) # add_custom_command ( # TARGET ${EXAMPLE_VARNAME}_${example_name} # POST_BUILD @@ -104,7 +104,7 @@ endif () #endif () #if (HDF5_VERSION_MAJOR VERSION_GREATER_EQUAL "1.14") # foreach (example_name ${1_14_examples}) -# if (H5EX_BUILD_TESTING) +# if (H5EXAMPLE_BUILD_TESTING) # add_custom_command ( # TARGET ${EXAMPLE_VARNAME}_${example_name} # POST_BUILD @@ -116,7 +116,7 @@ endif () #endif () #if (HDF5_VERSION_MAJOR VERSION_GREATER_EQUAL "2.0") # foreach (example_name ${2_0_examples}) -# if (H5EX_BUILD_TESTING) +# if (H5EXAMPLE_BUILD_TESTING) # add_custom_command ( # TARGET ${EXAMPLE_VARNAME}_${example_name} # POST_BUILD @@ -207,7 +207,7 @@ if (HDF5_PROVIDES_TOOLS) # endforeach () endif () -if (H5EX_BUILD_TESTING) +if (H5EXAMPLE_BUILD_TESTING) set (exfiles h5ex_g_iterate h5ex_g_traverse @@ -248,7 +248,7 @@ if (H5EX_BUILD_TESTING) -D "TEST_SKIP_COMPARE=TRUE" -D "TEST_OUTPUT=${testname}.out" -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) set_tests_properties (${EXAMPLE_VARNAME}_${testname} PROPERTIES DEPENDS ${EXAMPLE_VARNAME}_${testname}-clearall) if (HDF5_PROVIDES_TOOLS) @@ -256,14 +256,14 @@ if (H5EX_BUILD_TESTING) NAME ${EXAMPLE_VARNAME}_H5DUMP-${testname} COMMAND "${CMAKE_COMMAND}" -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}" - -D "TEST_PROGRAM=${H5EX_HDF5_DUMP_EXECUTABLE}" + -D "TEST_PROGRAM=${H5EXAMPLE_HDF5_DUMP_EXECUTABLE}" -D "TEST_ARGS:STRING=${ARGN};${testname}.h5" -D "TEST_FOLDER=${PROJECT_BINARY_DIR}" -D "TEST_OUTPUT=${testname}.out" -D "TEST_EXPECT=0" -D "TEST_REFERENCE=${testname}.ddl" -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) set_tests_properties (${EXAMPLE_VARNAME}_H5DUMP-${testname} PROPERTIES DEPENDS ${EXAMPLE_VARNAME}_${testname}) endif () @@ -286,21 +286,21 @@ if (H5EX_BUILD_TESTING) -D "TEST_OUTPUT=${testname}.out" -D "TEST_REFERENCE=${testname}.tst" -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) if (HDF5_PROVIDES_TOOLS) add_test ( NAME ${EXAMPLE_VARNAME}_H5DUMP-${testname} COMMAND "${CMAKE_COMMAND}" -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}" - -D "TEST_PROGRAM=${H5EX_HDF5_DUMP_EXECUTABLE}" + -D "TEST_PROGRAM=${H5EXAMPLE_HDF5_DUMP_EXECUTABLE}" -D "TEST_ARGS:STRING=${ARGN};${testname}.h5" -D "TEST_FOLDER=${PROJECT_BINARY_DIR}" -D "TEST_OUTPUT=${testname}.ddl.out" -D "TEST_EXPECT=0" -D "TEST_REFERENCE=${testname}.ddl" -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) set_tests_properties (${EXAMPLE_VARNAME}_H5DUMP-${testname} PROPERTIES DEPENDS ${EXAMPLE_VARNAME}_${testname}) endif () @@ -330,7 +330,7 @@ if (H5EX_BUILD_TESTING) -D "TEST_OUTPUT=${testname}.out" -D "TEST_REFERENCE=${testname}.tst" -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) set_tests_properties (${EXAMPLE_VARNAME}_${testname} PROPERTIES DEPENDS ${EXAMPLE_VARNAME}_${testname}-clearall) if (HDF5_PROVIDES_TOOLS) @@ -338,28 +338,28 @@ if (H5EX_BUILD_TESTING) NAME ${EXAMPLE_VARNAME}_H5DUMP-${testname}1 COMMAND "${CMAKE_COMMAND}" -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}" - -D "TEST_PROGRAM=${H5EX_HDF5_DUMP_EXECUTABLE}" + -D "TEST_PROGRAM=${H5EXAMPLE_HDF5_DUMP_EXECUTABLE}" -D "TEST_ARGS:STRING=${testname}1.h5" -D "TEST_FOLDER=${PROJECT_BINARY_DIR}" -D "TEST_OUTPUT=${testname}1.ddl.out" -D "TEST_EXPECT=0" -D "TEST_REFERENCE=${testname}1.ddl" -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) set_tests_properties (${EXAMPLE_VARNAME}_H5DUMP-${testname}1 PROPERTIES DEPENDS ${EXAMPLE_VARNAME}_${testname}) add_test ( NAME ${EXAMPLE_VARNAME}_H5DUMP-${testname}2 COMMAND "${CMAKE_COMMAND}" -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}" - -D "TEST_PROGRAM=${H5EX_HDF5_DUMP_EXECUTABLE}" + -D "TEST_PROGRAM=${H5EXAMPLE_HDF5_DUMP_EXECUTABLE}" -D "TEST_ARGS:STRING=${testname}2.h5" -D "TEST_FOLDER=${PROJECT_BINARY_DIR}" -D "TEST_OUTPUT=${testname}2.ddl.out" -D "TEST_EXPECT=0" -D "TEST_REFERENCE=${testname}2.ddl" -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) set_tests_properties (${EXAMPLE_VARNAME}_H5DUMP-${testname}2 PROPERTIES DEPENDS ${EXAMPLE_VARNAME}_H5DUMP-${testname}1) endif () @@ -388,7 +388,7 @@ if (H5EX_BUILD_TESTING) -D "TEST_OUTPUT=${testname}.out" -D "TEST_REFERENCE=${testname}.tst" -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) set_tests_properties (${EXAMPLE_VARNAME}_${testname} PROPERTIES DEPENDS ${EXAMPLE_VARNAME}_${testname}-clearall) endif () diff --git a/HDF5Examples/C/H5PAR/CMakeLists.txt b/HDF5Examples/C/H5PAR/CMakeLists.txt index 07a5acaa38c..b59aee1e548 100644 --- a/HDF5Examples/C/H5PAR/CMakeLists.txt +++ b/HDF5Examples/C/H5PAR/CMakeLists.txt @@ -18,10 +18,10 @@ foreach (example_name ${examples}) "$<$:-DH5_USE_200_API>" ) target_include_directories (${EXAMPLE_VARNAME}_${example_name} PUBLIC ${MPI_C_INCLUDE_DIRS}) - target_link_libraries (${EXAMPLE_VARNAME}_${example_name} ${H5EX_HDF5_LINK_LIBS}) + target_link_libraries (${EXAMPLE_VARNAME}_${example_name} ${H5EXAMPLE_HDF5_LINK_LIBS}) endforeach () -if (H5EX_BUILD_TESTING) +if (H5EXAMPLE_BUILD_TESTING) macro (ADD_GREP_TEST testname mumprocs) add_test ( NAME ${EXAMPLE_VARNAME}_${testname}-clearall @@ -42,7 +42,7 @@ if (H5EX_BUILD_TESTING) -D "TEST_GREP_COMPARE=TRUE" -D "TEST_REFERENCE:STRING=PHDF5 example finished with no errors" -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) set_tests_properties (MPI_TEST_${EXAMPLE_VARNAME}_${testname} PROPERTIES DEPENDS ${EXAMPLE_VARNAME}_${testname}-clearall) set (last_test "MPI_TEST_${EXAMPLE_VARNAME}_${testname}") diff --git a/HDF5Examples/C/H5T/CMakeLists.txt b/HDF5Examples/C/H5T/CMakeLists.txt index 777868a0fdb..d672460acf1 100644 --- a/HDF5Examples/C/H5T/CMakeLists.txt +++ b/HDF5Examples/C/H5T/CMakeLists.txt @@ -24,8 +24,8 @@ foreach (example_name ${common_examples}) if (H5_HAVE_PARALLEL) target_include_directories (${EXAMPLE_VARNAME}_${example_name} PUBLIC ${MPI_C_INCLUDE_DIRS}) endif () - target_link_libraries (${EXAMPLE_VARNAME}_${example_name} ${H5EX_HDF5_LINK_LIBS}) - if (H5EX_BUILD_TESTING) + target_link_libraries (${EXAMPLE_VARNAME}_${example_name} ${H5EXAMPLE_HDF5_LINK_LIBS}) + if (H5EXAMPLE_BUILD_TESTING) add_custom_command ( TARGET ${EXAMPLE_VARNAME}_${example_name} POST_BUILD @@ -50,8 +50,8 @@ endforeach () # if (H5_HAVE_PARALLEL) # target_include_directories (${EXAMPLE_VARNAME}_${example_name} PUBLIC ${MPI_C_INCLUDE_DIRS}) # endif () -# target_link_libraries (${EXAMPLE_VARNAME}_${example_name} ${H5EX_HDF5_LINK_LIBS}) -# if (H5EX_BUILD_TESTING) +# target_link_libraries (${EXAMPLE_VARNAME}_${example_name} ${H5EXAMPLE_HDF5_LINK_LIBS}) +# if (H5EXAMPLE_BUILD_TESTING) # add_custom_command ( # TARGET ${EXAMPLE_VARNAME}_${example_name} # POST_BUILD @@ -63,7 +63,7 @@ endforeach () #endif () #if (HDF5_VERSION_MAJOR VERSION_GREATER_EQUAL "1.10") # foreach (example_name ${1_10_examples}) -# if (H5EX_BUILD_TESTING) +# if (H5EXAMPLE_BUILD_TESTING) # add_custom_command ( # TARGET ${EXAMPLE_VARNAME}_${example_name} # POST_BUILD @@ -75,7 +75,7 @@ endforeach () #endif () #if (HDF5_VERSION_MAJOR VERSION_GREATER_EQUAL "1.12") # foreach (example_name ${1_12_examples}) -# if (H5EX_BUILD_TESTING) +# if (H5EXAMPLE_BUILD_TESTING) # add_custom_command ( # TARGET ${EXAMPLE_VARNAME}_${example_name} # POST_BUILD @@ -87,7 +87,7 @@ endforeach () #endif () #if (HDF5_VERSION_MAJOR VERSION_GREATER_EQUAL "1.14") # foreach (example_name ${1_14_examples}) -# if (H5EX_BUILD_TESTING) +# if (H5EXAMPLE_BUILD_TESTING) # add_custom_command ( # TARGET ${EXAMPLE_VARNAME}_${example_name} # POST_BUILD @@ -99,7 +99,7 @@ endforeach () #endif () if (HDF5_VERSION_MAJOR VERSION_GREATER_EQUAL "2.0") foreach (example_name ${2_0_examples}) - if (H5EX_BUILD_TESTING) + if (H5EXAMPLE_BUILD_TESTING) # add_custom_command ( # TARGET ${EXAMPLE_VARNAME}_${example_name} # POST_BUILD @@ -346,7 +346,7 @@ if (HDF5_PROVIDES_TOOLS) # endforeach () endif () -if (H5EX_BUILD_TESTING) +if (H5EXAMPLE_BUILD_TESTING) macro (ADD_H5_TEST testname) add_test ( NAME ${EXAMPLE_VARNAME}_${testname}-clearall @@ -369,7 +369,7 @@ if (H5EX_BUILD_TESTING) -D "TEST_OUTPUT=${testname}.out" -D "TEST_REFERENCE=${testname}.tst" -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) set_tests_properties (${EXAMPLE_VARNAME}_${testname} PROPERTIES DEPENDS ${EXAMPLE_VARNAME}_${testname}-clearall) if (HDF5_PROVIDES_TOOLS) @@ -377,14 +377,14 @@ if (H5EX_BUILD_TESTING) NAME ${EXAMPLE_VARNAME}_H5DUMP-${testname} COMMAND "${CMAKE_COMMAND}" -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}" - -D "TEST_PROGRAM=${H5EX_HDF5_DUMP_EXECUTABLE}" + -D "TEST_PROGRAM=${H5EXAMPLE_HDF5_DUMP_EXECUTABLE}" -D "TEST_ARGS:STRING=${ARGN};${testname}.h5" -D "TEST_FOLDER=${PROJECT_BINARY_DIR}" -D "TEST_OUTPUT=${testname}.ddl.out" -D "TEST_EXPECT=0" -D "TEST_REFERENCE=${testname}.ddl" -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) set_tests_properties (${EXAMPLE_VARNAME}_H5DUMP-${testname} PROPERTIES DEPENDS ${EXAMPLE_VARNAME}_${testname}) endif () @@ -413,7 +413,7 @@ if (H5EX_BUILD_TESTING) -D "TEST_OUTPUT=${testname}.out" -D "TEST_REFERENCE=${testname}.tst" -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) set_tests_properties (${EXAMPLE_VARNAME}_${testname} PROPERTIES DEPENDS ${EXAMPLE_VARNAME}_${testname}-clearall) endif () diff --git a/HDF5Examples/C/H5VDS/CMakeLists.txt b/HDF5Examples/C/H5VDS/CMakeLists.txt index 474fc4eaa59..2e5ee8252a6 100644 --- a/HDF5Examples/C/H5VDS/CMakeLists.txt +++ b/HDF5Examples/C/H5VDS/CMakeLists.txt @@ -24,8 +24,8 @@ if (HDF5_VERSION_MAJOR VERSION_GREATER_EQUAL "1.10") if (H5_HAVE_PARALLEL) target_include_directories (${EXAMPLE_VARNAME}_${example_name} PUBLIC ${MPI_C_INCLUDE_DIRS}) endif () - target_link_libraries (${EXAMPLE_VARNAME}_${example_name} ${H5EX_HDF5_LINK_LIBS}) - if (H5EX_BUILD_TESTING) + target_link_libraries (${EXAMPLE_VARNAME}_${example_name} ${H5EXAMPLE_HDF5_LINK_LIBS}) + if (H5EXAMPLE_BUILD_TESTING) add_custom_command ( TARGET ${EXAMPLE_VARNAME}_${example_name} POST_BUILD @@ -38,7 +38,7 @@ endif () #if (HDF5_VERSION_MAJOR VERSION_GREATER_EQUAL "1.12") # foreach (example_name ${1_12_examples}) -# if (H5EX_BUILD_TESTING) +# if (H5EXAMPLE_BUILD_TESTING) # add_custom_command ( # TARGET ${EXAMPLE_VARNAME}_${example_name} # POST_BUILD @@ -50,7 +50,7 @@ endif () #endif () #if (HDF5_VERSION_MAJOR VERSION_GREATER_EQUAL "1.14") # foreach (example_name ${1_14_examples}) -# if (H5EX_BUILD_TESTING) +# if (H5EXAMPLE_BUILD_TESTING) # add_custom_command ( # TARGET ${EXAMPLE_VARNAME}_${example_name} # POST_BUILD @@ -62,7 +62,7 @@ endif () #endif () #if (HDF5_VERSION_MAJOR VERSION_GREATER_EQUAL "2.0") # foreach (example_name ${2_0_examples}) -# if (H5EX_BUILD_TESTING) +# if (H5EXAMPLE_BUILD_TESTING) # add_custom_command ( # TARGET ${EXAMPLE_VARNAME}_${example_name} # POST_BUILD @@ -120,7 +120,7 @@ if (HDF5_PROVIDES_TOOLS) # endforeach () endif () -if (H5EX_BUILD_TESTING) +if (H5EXAMPLE_BUILD_TESTING) macro (ADD_H5_TEST testname) add_test ( NAME ${EXAMPLE_VARNAME}_${testname}-clearall @@ -143,7 +143,7 @@ if (H5EX_BUILD_TESTING) -D "TEST_OUTPUT=${testname}.out" -D "TEST_REFERENCE=${testname}.tst" -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) set_tests_properties (${EXAMPLE_VARNAME}_${testname} PROPERTIES DEPENDS ${EXAMPLE_VARNAME}_${testname}-clearall) if (HDF5_PROVIDES_TOOLS) @@ -151,14 +151,14 @@ if (H5EX_BUILD_TESTING) NAME ${EXAMPLE_VARNAME}_H5DUMP-${testname} COMMAND "${CMAKE_COMMAND}" -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}" - -D "TEST_PROGRAM=${H5EX_HDF5_DUMP_EXECUTABLE}" + -D "TEST_PROGRAM=${H5EXAMPLE_HDF5_DUMP_EXECUTABLE}" -D "TEST_ARGS:STRING=${ARGN};${testname}.h5" -D "TEST_FOLDER=${PROJECT_BINARY_DIR}" -D "TEST_OUTPUT=${testname}.ddl.out" -D "TEST_EXPECT=0" -D "TEST_REFERENCE=${testname}.ddl" -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) set_tests_properties (${EXAMPLE_VARNAME}_H5DUMP-${testname} PROPERTIES DEPENDS ${EXAMPLE_VARNAME}_${testname}) endif () diff --git a/HDF5Examples/C/HL/CMakeLists.txt b/HDF5Examples/C/HL/CMakeLists.txt index 262465ae437..4baba37f108 100644 --- a/HDF5Examples/C/HL/CMakeLists.txt +++ b/HDF5Examples/C/HL/CMakeLists.txt @@ -20,8 +20,8 @@ foreach (example_name ${common_examples}) if (H5_HAVE_PARALLEL) target_include_directories (${EXAMPLE_VARNAME}_${example_name} PUBLIC ${MPI_C_INCLUDE_DIRS}) endif () - target_link_libraries (${EXAMPLE_VARNAME}_${example_name} ${H5EX_HDF5_LINK_LIBS}) - if (H5EX_BUILD_TESTING) + target_link_libraries (${EXAMPLE_VARNAME}_${example_name} ${H5EXAMPLE_HDF5_LINK_LIBS}) + if (H5EXAMPLE_BUILD_TESTING) add_custom_command ( TARGET ${EXAMPLE_VARNAME}_${example_name} POST_BUILD @@ -46,8 +46,8 @@ endforeach () # if (H5_HAVE_PARALLEL) # target_include_directories (${EXAMPLE_VARNAME}_${example_name} PUBLIC ${MPI_C_INCLUDE_DIRS}) # endif () -# target_link_libraries (${EXAMPLE_VARNAME}_${example_name} ${H5EX_HDF5_LINK_LIBS}) -# if (H5EX_BUILD_TESTING) +# target_link_libraries (${EXAMPLE_VARNAME}_${example_name} ${H5EXAMPLE_HDF5_LINK_LIBS}) +# if (H5EXAMPLE_BUILD_TESTING) # add_custom_command ( # TARGET ${EXAMPLE_VARNAME}_${example_name} # POST_BUILD @@ -59,7 +59,7 @@ endforeach () #endif () #if (HDF5_VERSION_MAJOR VERSION_GREATER_EQUAL "1.10") # foreach (example_name ${1_10_examples}) -# if (H5EX_BUILD_TESTING) +# if (H5EXAMPLE_BUILD_TESTING) # add_custom_command ( # TARGET ${EXAMPLE_VARNAME}_${example_name} # POST_BUILD @@ -71,7 +71,7 @@ endforeach () #endif () #if (HDF5_VERSION_MAJOR VERSION_GREATER_EQUAL "1.12") # foreach (example_name ${1_12_examples}) -# if (H5EX_BUILD_TESTING) +# if (H5EXAMPLE_BUILD_TESTING) # add_custom_command ( # TARGET ${EXAMPLE_VARNAME}_${example_name} # POST_BUILD @@ -83,7 +83,7 @@ endforeach () #endif () #if (HDF5_VERSION_MAJOR VERSION_GREATER_EQUAL "1.14") # foreach (example_name ${1_14_examples}) -# if (H5EX_BUILD_TESTING) +# if (H5EXAMPLE_BUILD_TESTING) # add_custom_command ( # TARGET ${EXAMPLE_VARNAME}_${example_name} # POST_BUILD @@ -95,7 +95,7 @@ endforeach () #endif () #if (HDF5_VERSION_MAJOR VERSION_GREATER_EQUAL "2.0") # foreach (example_name ${2_0_examples}) -# if (H5EX_BUILD_TESTING) +# if (H5EXAMPLE_BUILD_TESTING) # add_custom_command ( # TARGET ${EXAMPLE_VARNAME}_${example_name} # POST_BUILD @@ -191,7 +191,7 @@ if (HDF5_PROVIDES_TOOLS) # endforeach () endif () -if (H5EX_BUILD_TESTING) +if (H5EXAMPLE_BUILD_TESTING) macro (ADD_H5_TEST testname) add_test ( NAME ${EXAMPLE_VARNAME}_${testname}-clearall @@ -214,7 +214,7 @@ if (H5EX_BUILD_TESTING) -D "TEST_OUTPUT=${testname}.out" -D "TEST_REFERENCE=${testname}.tst" -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) set_tests_properties (${EXAMPLE_VARNAME}_${testname} PROPERTIES DEPENDS ${EXAMPLE_VARNAME}_${testname}-clearall) if (HDF5_PROVIDES_TOOLS) @@ -222,14 +222,14 @@ if (H5EX_BUILD_TESTING) NAME ${EXAMPLE_VARNAME}_H5DUMP-${testname} COMMAND "${CMAKE_COMMAND}" -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}" - -D "TEST_PROGRAM=${H5EX_HDF5_DUMP_EXECUTABLE}" + -D "TEST_PROGRAM=${H5EXAMPLE_HDF5_DUMP_EXECUTABLE}" -D "TEST_ARGS:STRING=${ARGN};${testname}.h5" -D "TEST_FOLDER=${PROJECT_BINARY_DIR}" -D "TEST_OUTPUT=${testname}.ddl.out" -D "TEST_EXPECT=0" -D "TEST_REFERENCE=${testname}.ddl" -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) set_tests_properties (${EXAMPLE_VARNAME}_H5DUMP-${testname} PROPERTIES DEPENDS ${EXAMPLE_VARNAME}_${testname}) endif () @@ -258,7 +258,7 @@ if (H5EX_BUILD_TESTING) -D "TEST_OUTPUT=${testname}.out" -D "TEST_REFERENCE=${testname}.tst" -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) set_tests_properties (${EXAMPLE_VARNAME}_${testname} PROPERTIES DEPENDS ${EXAMPLE_VARNAME}_${testname}-clearall) if (HDF5_PROVIDES_TOOLS) @@ -266,7 +266,7 @@ if (H5EX_BUILD_TESTING) NAME ${EXAMPLE_VARNAME}_H5DUMP-${testname} COMMAND "${CMAKE_COMMAND}" -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}" - -D "TEST_PROGRAM=${H5EX_HDF5_DUMP_EXECUTABLE}" + -D "TEST_PROGRAM=${H5EXAMPLE_HDF5_DUMP_EXECUTABLE}" -D "TEST_ARGS:STRING=${ARGN};${testname}.h5" -D "TEST_FOLDER=${PROJECT_BINARY_DIR}" -D "TEST_OUTPUT=${testname}.ddl.out" @@ -274,7 +274,7 @@ if (H5EX_BUILD_TESTING) -D "TEST_SKIP_COMPARE=TRUE" #-D "TEST_REFERENCE=${testname}.ddl" -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) set_tests_properties (${EXAMPLE_VARNAME}_H5DUMP-${testname} PROPERTIES DEPENDS ${EXAMPLE_VARNAME}_${testname}) endif () @@ -313,7 +313,7 @@ if (H5EX_BUILD_TESTING) -D "TEST_OUTPUT=h5ex_lite1.out" -D "TEST_REFERENCE=h5ex_lite1.tst" -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) set_tests_properties (${EXAMPLE_VARNAME}_h5ex_lite1 PROPERTIES DEPENDS ${EXAMPLE_VARNAME}_h5ex_lite-clearall) add_test ( @@ -327,7 +327,7 @@ if (H5EX_BUILD_TESTING) -D "TEST_OUTPUT=h5ex_lite2.out" -D "TEST_REFERENCE=h5ex_lite2.tst" -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) set_tests_properties (${EXAMPLE_VARNAME}_h5ex_lite2 PROPERTIES DEPENDS ${EXAMPLE_VARNAME}_h5ex_lite1) endif () diff --git a/HDF5Examples/C/Perf/CMakeLists.txt b/HDF5Examples/C/Perf/CMakeLists.txt index 2208d144638..c8ebd4469ff 100644 --- a/HDF5Examples/C/Perf/CMakeLists.txt +++ b/HDF5Examples/C/Perf/CMakeLists.txt @@ -21,10 +21,10 @@ foreach (example ${examples}) if (H5_HAVE_PARALLEL) target_include_directories (${EXAMPLE_VARNAME}_${example_name} PUBLIC ${MPI_C_INCLUDE_DIRS}) endif () - target_link_libraries (${EXAMPLE_VARNAME}_${example_name} ${H5EX_HDF5_LINK_LIBS}) + target_link_libraries (${EXAMPLE_VARNAME}_${example_name} ${H5EXAMPLE_HDF5_LINK_LIBS}) endforeach () -if (H5EX_BUILD_TESTING) +if (H5EXAMPLE_BUILD_TESTING) macro (ADD_H5_TEST testname) add_test ( NAME ${EXAMPLE_VARNAME}_${testname}-clearall @@ -42,21 +42,21 @@ if (H5EX_BUILD_TESTING) -D "TEST_OUTPUT=${testname}.out" -D "TEST_REFERENCE=${testname}.tst" -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) set_tests_properties (${EXAMPLE_VARNAME}_${testname} PROPERTIES DEPENDS ${EXAMPLE_VARNAME}_${testname}-clearall) if (HDF5_PROVIDES_TOOLS) add_test ( NAME ${EXAMPLE_VARNAME}_H5DUMP-${testname} COMMAND "${CMAKE_COMMAND}" - -D "TEST_PROGRAM=${H5EX_HDF5_DUMP_EXECUTABLE}" + -D "TEST_PROGRAM=${H5EXAMPLE_HDF5_DUMP_EXECUTABLE}" -D "TEST_ARGS:STRING=${ARGN};${testname}.h5" -D "TEST_FOLDER=${PROJECT_BINARY_DIR}" -D "TEST_OUTPUT=${testname}.dmp.out" -D "TEST_EXPECT=0" -D "TEST_REFERENCE=${testname}.dmp" -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) set_tests_properties (${EXAMPLE_VARNAME}_H5DUMP-${testname} PROPERTIES DEPENDS ${EXAMPLE_VARNAME}_${testname}) endif () diff --git a/HDF5Examples/C/TUTR/CMakeLists.txt b/HDF5Examples/C/TUTR/CMakeLists.txt index 7137dbd4113..e5b388b8d34 100644 --- a/HDF5Examples/C/TUTR/CMakeLists.txt +++ b/HDF5Examples/C/TUTR/CMakeLists.txt @@ -20,11 +20,11 @@ foreach (example_name ${examples}) if (H5_HAVE_PARALLEL) target_include_directories (${EXAMPLE_VARNAME}_tutr_${example_name} PUBLIC ${MPI_C_INCLUDE_DIRS}) endif () - target_link_libraries (${EXAMPLE_VARNAME}_tutr_${example_name} ${H5EX_HDF5_LINK_LIBS}) + target_link_libraries (${EXAMPLE_VARNAME}_tutr_${example_name} ${H5EXAMPLE_HDF5_LINK_LIBS}) endforeach () -if (H5EX_BUILD_TESTING) +if (H5EXAMPLE_BUILD_TESTING) file (MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/red ${PROJECT_BINARY_DIR}/blue ${PROJECT_BINARY_DIR}/u2w) set (${EXAMPLE_VARNAME}_tutr_CLEANFILES @@ -97,7 +97,7 @@ if (H5EX_BUILD_TESTING) -D "TEST_SKIP_COMPARE=TRUE" -D "TEST_OUTPUT=${testname}.out" -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) endif () set_tests_properties (${EXAMPLE_VARNAME}_tutr_${testname} PROPERTIES FIXTURES_REQUIRED clear_${EXAMPLE_VARNAME}_tutr) diff --git a/HDF5Examples/CMakeLists.txt b/HDF5Examples/CMakeLists.txt index df1f9bc743a..61020a18f96 100644 --- a/HDF5Examples/CMakeLists.txt +++ b/HDF5Examples/CMakeLists.txt @@ -3,7 +3,7 @@ # Fortran, Java, and filter examples. # It also handles MPI/parallel support, version parsing, and testing configuration. # -# The option naming convention is H5EX_* for examples options and HDF5_* for HDF5 +# The option naming convention is H5EXAMPLE_* for examples options and HDF5_* for HDF5 # library features. cmake_minimum_required (VERSION 3.26) @@ -12,24 +12,24 @@ project (H5EXAMPLES C) #----------------------------------------------------------------------------- # Define some CMake variables for use later in the project #----------------------------------------------------------------------------- -set (H5EX_C_SRC_DIR ${H5EXAMPLES_SOURCE_DIR}/C) -set (H5EX_CXX_SRC_DIR ${H5EXAMPLES_SOURCE_DIR}/CXX) -set (H5EX_F90_SRC_DIR ${H5EXAMPLES_SOURCE_DIR}/FORTRAN) -set (H5EX_JAVA_DIR ${H5EXAMPLES_SOURCE_DIR}/JAVA) +set (H5EXAMPLE_C_SRC_DIR ${H5EXAMPLES_SOURCE_DIR}/C) +set (H5EXAMPLE_CXX_SRC_DIR ${H5EXAMPLES_SOURCE_DIR}/CXX) +set (H5EXAMPLE_F90_SRC_DIR ${H5EXAMPLES_SOURCE_DIR}/FORTRAN) +set (H5EXAMPLE_JAVA_DIR ${H5EXAMPLES_SOURCE_DIR}/JAVA) #----------------------------------------------------------------------------- # Basic HDF5Examples stuff here #----------------------------------------------------------------------------- if (NOT EXAMPLES_EXTERNALLY_CONFIGURED) - set (H5EX_CONFIG_DIR ${H5EXAMPLES_SOURCE_DIR}/config) - set (H5EX_RESOURCES_DIR ${H5EXAMPLES_SOURCE_DIR}/config/cmake) + set (H5EXAMPLE_CONFIG_DIR ${H5EXAMPLES_SOURCE_DIR}/config) + set (H5EXAMPLE_RESOURCES_DIR ${H5EXAMPLES_SOURCE_DIR}/config/cmake) include (TestBigEndian) if (NOT WINDOWS) - TEST_BIG_ENDIAN (H5EX_WORDS_BIGENDIAN) + TEST_BIG_ENDIAN (H5EXAMPLE_WORDS_BIGENDIAN) endif () - include (${H5EX_CONFIG_DIR}/HDFMacros.cmake) - include (${H5EX_RESOURCES_DIR}/HDFExampleMacros.cmake) + include (${H5EXAMPLE_CONFIG_DIR}/HDFMacros.cmake) + include (${H5EXAMPLE_RESOURCES_DIR}/HDFExampleMacros.cmake) set (CMAKE_JAVA_INCLUDE_PATH "") SET_HDF_BUILD_TYPE() @@ -47,14 +47,14 @@ if (NOT EXAMPLES_EXTERNALLY_CONFIGURED) #----------------------------------------------------------------------------- PYTHON_SUPPORT () endif () -message (STATUS "HDF5 link libs: ${H5EX_HDF5_LINK_LIBS}") +message (STATUS "HDF5 link libs: ${H5EXAMPLE_HDF5_LINK_LIBS}") message (STATUS "HDF5 H5_LIBVER_DIR: ${H5_LIBVER_DIR} HDF5_VERSION_MAJOR: ${HDF5_VERSION_MAJOR}") #----------------------------------------------------------------------------- # Option to build JAVA examples #----------------------------------------------------------------------------- -option (H5EX_BUILD_JAVA "Build JAVA support" OFF) -if (H5EX_BUILD_JAVA) +option (H5EXAMPLE_BUILD_JAVA "Build JAVA support" OFF) +if (H5EXAMPLE_BUILD_JAVA) find_package (Java) include (UseJava) @@ -64,7 +64,7 @@ endif () # parse the full version number from H5public.h and include in H5_VERS_INFO #----------------------------------------------------------------------------- if(NOT DEFINED _h5public_h_contents) - find_file (_h5public_h H5public.h ${H5EX_HDF5_INCLUDE_DIRS}) + find_file (_h5public_h H5public.h ${H5EXAMPLE_HDF5_INCLUDE_DIRS}) file (READ ${_h5public_h} _h5public_h_contents) string (REGEX REPLACE ".*#define[ \t]+H5_VERS_MAJOR[ \t]+([0-9]*).*$" @@ -86,9 +86,9 @@ endif () #----------------------------------------------------------------------------- # Option to Enable MPI Parallel #----------------------------------------------------------------------------- -set (CMAKE_MODULE_PATH ${H5EX_CONFIG_DIR} ${H5EX_RESOURCES_DIR} ${CMAKE_MODULE_PATH}) -option (H5EX_ENABLE_PARALLEL "Enable parallel build (requires MPI)" OFF) -if (H5EX_ENABLE_PARALLEL) +set (CMAKE_MODULE_PATH ${H5EXAMPLE_CONFIG_DIR} ${H5EXAMPLE_RESOURCES_DIR} ${CMAKE_MODULE_PATH}) +option (H5EXAMPLE_ENABLE_PARALLEL "Enable parallel build (requires MPI)" OFF) +if (H5EXAMPLE_ENABLE_PARALLEL) find_package(MPI REQUIRED) if (MPI_C_FOUND) set (H5_HAVE_PARALLEL 1) @@ -106,7 +106,7 @@ endif () # Parallel IO usage requires MPI to be Linked and Included if (H5_HAVE_PARALLEL) - set (H5EX_HDF5_LINK_LIBS ${H5EX_HDF5_LINK_LIBS} ${MPI_C_LIBRARIES}) + set (H5EXAMPLE_HDF5_LINK_LIBS ${H5EXAMPLE_HDF5_LINK_LIBS} ${MPI_C_LIBRARIES}) if (MPI_C_LINK_FLAGS) set (CMAKE_EXE_LINKER_FLAGS "${MPI_C_LINK_FLAGS} ${CMAKE_EXE_LINKER_FLAGS}") endif () @@ -114,21 +114,21 @@ if (H5_HAVE_PARALLEL) endif () set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES - "${H5EX_HDF5_INCLUDE_DIRS}" + "${H5EXAMPLE_HDF5_INCLUDE_DIRS}" ) #----------------------------------------------------------------------------- # Dashboard and Testing Settings #----------------------------------------------------------------------------- -option (H5EX_BUILD_TESTING "Build HDF5 Example Testing" OFF) -if (H5EX_BUILD_TESTING) +option (H5EXAMPLE_BUILD_TESTING "Build HDF5 Example Testing" OFF) +if (H5EXAMPLE_BUILD_TESTING) set (DART_TESTING_TIMEOUT 1200 CACHE STRING "Timeout in seconds for each test (default 1200=20minutes)" ) enable_testing () include (CTest) include (${PROJECT_SOURCE_DIR}/CTestConfig.cmake) - configure_file (${H5EX_CONFIG_DIR}/CTestCustom.cmake ${PROJECT_BINARY_DIR}/CTestCustom.ctest @ONLY) + configure_file (${H5EXAMPLE_CONFIG_DIR}/CTestCustom.cmake ${PROJECT_BINARY_DIR}/CTestCustom.ctest @ONLY) endif () if (${H5_LIBVER_DIR} GREATER 16) @@ -141,25 +141,25 @@ if (${H5_LIBVER_DIR} GREATER 16) set (H5_FC_FUNC "H5_FC_FUNC(name,NAME) name ## _") set (H5_FC_FUNC_ "H5_FC_FUNC_(name,NAME) name ## _") if (EXISTS "${H5EXAMPLES_SOURCE_DIR}/FORTRAN" AND IS_DIRECTORY "${H5EXAMPLES_SOURCE_DIR}/FORTRAN") - option (H5EX_BUILD_FORTRAN "Build examples FORTRAN support" OFF) - if (H5EX_BUILD_FORTRAN AND HDF5_PROVIDES_FORTRAN) - set (H5EX_LINK_Fortran_LIBS ${H5EX_HDF5_LINK_LIBS}) + option (H5EXAMPLE_BUILD_FORTRAN "Build examples FORTRAN support" OFF) + 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 (H5EX_LINK_Fortran_LIBS ${H5EX_LINK_Fortran_LIBS} ${MPI_Fortran_LIBRARIES}) + 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 (${H5EX_F90_SRC_DIR}/H5D/h5_version.h.in ${PROJECT_BINARY_DIR}/FORTRAN/H5D/h5_version.h @ONLY) - configure_file (${H5EX_F90_SRC_DIR}/H5D/h5_version.h.in ${PROJECT_BINARY_DIR}/FORTRAN/H5G/h5_version.h @ONLY) + 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 () - set (H5EX_BUILD_FORTRAN OFF CACHE BOOL "Build examples FORTRAN support" FORCE) + set (H5EXAMPLE_BUILD_FORTRAN OFF CACHE BOOL "Build examples FORTRAN support" FORCE) endif () else () - set (H5EX_BUILD_FORTRAN OFF CACHE BOOL "Build examples FORTRAN support" FORCE) + set (H5EXAMPLE_BUILD_FORTRAN OFF CACHE BOOL "Build examples FORTRAN support" FORCE) endif () if (${H5_LIBVER_DIR} GREATER 18) @@ -167,71 +167,71 @@ if (${H5_LIBVER_DIR} GREATER 16) # Option to build JAVA examples #----------------------------------------------------------------------------- if (EXISTS "${H5EXAMPLES_SOURCE_DIR}/JAVA" AND IS_DIRECTORY "${H5EXAMPLES_SOURCE_DIR}/JAVA") - option (H5EX_BUILD_JAVA "Build examples JAVA support" OFF) + option (H5EXAMPLE_BUILD_JAVA "Build examples JAVA support" OFF) else () - set (H5EX_BUILD_JAVA OFF CACHE BOOL "Build examples JAVA support" FORCE) + set (H5EXAMPLE_BUILD_JAVA OFF CACHE BOOL "Build examples JAVA support" FORCE) endif () else () - set (H5EX_BUILD_JAVA OFF CACHE BOOL "Build examples JAVA support" FORCE) + set (H5EXAMPLE_BUILD_JAVA OFF CACHE BOOL "Build examples JAVA support" FORCE) endif () #----------------------------------------------------------------------------- # Build the HL Examples #----------------------------------------------------------------------------- - option (H5EX_BUILD_HL "Build examples HIGH Level support" OFF) + option (H5EXAMPLE_BUILD_HL "Build examples HIGH Level support" OFF) #----------------------------------------------------------------------------- # Build the CPP Examples #----------------------------------------------------------------------------- if (EXISTS "${H5EXAMPLES_SOURCE_DIR}/CXX" AND IS_DIRECTORY "${H5EXAMPLES_SOURCE_DIR}/CXX") - option (H5EX_BUILD_CXX "Build examples C++ support" OFF) + option (H5EXAMPLE_BUILD_CXX "Build examples C++ support" OFF) else () - set (H5EX_BUILD_CXX OFF CACHE BOOL "Build examples C++ support" FORCE) + set (H5EXAMPLE_BUILD_CXX OFF CACHE BOOL "Build examples C++ support" FORCE) endif () #----------------------------------------------------------------------------- # Option to build filter examples #----------------------------------------------------------------------------- if (EXISTS "${H5EXAMPLES_SOURCE_DIR}/C/H5FLT" AND IS_DIRECTORY "${H5EXAMPLES_SOURCE_DIR}/C/H5FLT") - option (H5EX_BUILD_FILTERS "Build examples PLUGIN filter support" OFF) - if (H5EX_BUILD_FILTERS AND HDF5_PROVIDES_PLUGIN_SUPPORT) + option (H5EXAMPLE_BUILD_FILTERS "Build examples PLUGIN filter support" OFF) + if (H5EXAMPLE_BUILD_FILTERS AND HDF5_PROVIDES_PLUGIN_SUPPORT) if(DEFINED ENV{HDF5_PLUGIN_PATH}) message (STATUS "ENV PATH=$ENV{HDF5_PLUGIN_PATH}") - set (H5EX_HDF5_PLUGIN_PATH $ENV{HDF5_PLUGIN_PATH}) + set (H5EXAMPLE_HDF5_PLUGIN_PATH $ENV{HDF5_PLUGIN_PATH}) else () - if(NOT DEFINED H5EX_HDF5_PLUGIN_PATH) + if(NOT DEFINED H5EXAMPLE_HDF5_PLUGIN_PATH) message (STATUS "LIBRARY PATH=${HDF5_LIBRARY_PATH}/plugin") - set (H5EX_HDF5_PLUGIN_PATH ${HDF5_LIBRARY_PATH}/plugin) + set (H5EXAMPLE_HDF5_PLUGIN_PATH ${HDF5_LIBRARY_PATH}/plugin) endif () endif () - message (STATUS "H5EX_HDF5_PLUGIN_PATH=${H5EX_HDF5_PLUGIN_PATH}") + message (STATUS "H5EXAMPLE_HDF5_PLUGIN_PATH=${H5EXAMPLE_HDF5_PLUGIN_PATH}") else () - set (H5EX_BUILD_FILTERS OFF CACHE BOOL "Build examples PLUGIN filter support" FORCE) + set (H5EXAMPLE_BUILD_FILTERS OFF CACHE BOOL "Build examples PLUGIN filter support" FORCE) endif () else () - set (H5EX_BUILD_FILTERS OFF CACHE BOOL "Build examples PLUGIN filter support" FORCE) + set (H5EXAMPLE_BUILD_FILTERS OFF CACHE BOOL "Build examples PLUGIN filter support" FORCE) endif () else () - set (H5EX_BUILD_HL OFF CACHE BOOL "Build examples High Level support" FORCE) - set (H5EX_BUILD_FORTRAN OFF CACHE BOOL "Build examples FORTRAN support" FORCE) - set (H5EX_BUILD_JAVA OFF CACHE BOOL "Build examples JAVA support" FORCE) - set (H5EX_BUILD_CXX OFF CACHE BOOL "Build examples C++ support" FORCE) - set (H5EX_BUILD_FILTERS OFF CACHE BOOL "Build examples PLUGIN filter support" FORCE) + set (H5EXAMPLE_BUILD_HL OFF CACHE BOOL "Build examples High Level support" FORCE) + set (H5EXAMPLE_BUILD_FORTRAN OFF CACHE BOOL "Build examples FORTRAN support" FORCE) + set (H5EXAMPLE_BUILD_JAVA OFF CACHE BOOL "Build examples JAVA support" FORCE) + set (H5EXAMPLE_BUILD_CXX OFF CACHE BOOL "Build examples C++ support" FORCE) + set (H5EXAMPLE_BUILD_FILTERS OFF CACHE BOOL "Build examples PLUGIN filter support" FORCE) endif () #----------------------------------------------------------------------------- # Build examples #----------------------------------------------------------------------------- add_subdirectory (C) -if (H5EX_BUILD_FORTRAN AND HDF5_PROVIDES_FORTRAN) +if (H5EXAMPLE_BUILD_FORTRAN AND HDF5_PROVIDES_FORTRAN) add_subdirectory (FORTRAN) endif () -if (H5EX_BUILD_JAVA AND HDF5_PROVIDES_JAVA) +if (H5EXAMPLE_BUILD_JAVA AND HDF5_PROVIDES_JAVA) add_subdirectory (JAVA) endif () -if (H5EX_BUILD_CXX AND HDF5_PROVIDES_CPP_LIB) +if (H5EXAMPLE_BUILD_CXX AND HDF5_PROVIDES_CPP_LIB) add_subdirectory (CXX) endif () -if (H5EX_BUILD_PYTHON) +if (H5EXAMPLE_BUILD_PYTHON) add_subdirectory (PYTHON) endif () diff --git a/HDF5Examples/CMakePresets.json b/HDF5Examples/CMakePresets.json index a7d85823da9..2dade32f482 100644 --- a/HDF5Examples/CMakePresets.json +++ b/HDF5Examples/CMakePresets.json @@ -11,35 +11,35 @@ "CPACK_PACKAGE_VERSION": "2.0.4", "HDF5_NAMESPACE": {"type": "STRING", "value": "hdf5::"}, "HDF5_PACKAGE_NAME": {"type": "STRING", "value": "hdf5"}, - "H5EX_BUILD_TESTING": "ON" + "H5EXAMPLE_BUILD_TESTING": "ON" } }, { "name": "ci-StdHL", "hidden": true, "cacheVariables": { - "H5EX_BUILD_HL": "ON" + "H5EXAMPLE_BUILD_HL": "ON" } }, { "name": "ci-StdJava", "hidden": true, "cacheVariables": { - "H5EX_BUILD_JAVA": "ON" + "H5EXAMPLE_BUILD_JAVA": "ON" } }, { "name": "ci-StdFortran", "hidden": true, "cacheVariables": { - "H5EX_BUILD_FORTRAN": "ON" + "H5EXAMPLE_BUILD_FORTRAN": "ON" } }, { "name": "ci-StdPlugins", "hidden": true, "cacheVariables": { - "H5EX_BUILD_FILTERS": "ON" + "H5EXAMPLE_BUILD_FILTERS": "ON" } }, { diff --git a/HDF5Examples/CXX/CMakeLists.txt b/HDF5Examples/CXX/CMakeLists.txt index 3dbb39d0256..8681d97b2d9 100644 --- a/HDF5Examples/CXX/CMakeLists.txt +++ b/HDF5Examples/CXX/CMakeLists.txt @@ -5,6 +5,6 @@ add_subdirectory (H5D) add_subdirectory (TUTR) #-- Add High Level Examples -if (H5EX_BUILD_HL AND HDF5_PROVIDES_HL_LIB) +if (H5EXAMPLE_BUILD_HL AND HDF5_PROVIDES_HL_LIB) add_subdirectory (HL) endif () diff --git a/HDF5Examples/CXX/H5D/CMakeLists.txt b/HDF5Examples/CXX/H5D/CMakeLists.txt index 2cecb03c107..45cfbdffbc3 100644 --- a/HDF5Examples/CXX/H5D/CMakeLists.txt +++ b/HDF5Examples/CXX/H5D/CMakeLists.txt @@ -21,11 +21,11 @@ if (HDF5_VERSION_MAJOR VERSION_GREATER_EQUAL "1.8") if (H5_HAVE_PARALLEL) target_include_directories (${EXAMPLE_VARNAME}_cpp_ex_${example_name} PUBLIC ${MPI_C_INCLUDE_DIRS}) endif () - target_link_libraries (${EXAMPLE_VARNAME}_cpp_ex_${example_name} ${H5EX_HDF5_LINK_LIBS}) + target_link_libraries (${EXAMPLE_VARNAME}_cpp_ex_${example_name} ${H5EXAMPLE_HDF5_LINK_LIBS}) endforeach () endif () -if (H5EX_BUILD_TESTING) +if (H5EXAMPLE_BUILD_TESTING) set (${EXAMPLE_VARNAME}_cpp_ex_CLEANFILES Group.h5 SDS.h5 @@ -67,7 +67,7 @@ if (H5EX_BUILD_TESTING) -D "TEST_SKIP_COMPARE=TRUE" -D "TEST_OUTPUT=${testname}.out" -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) endif () set_tests_properties (${EXAMPLE_VARNAME}_cpp_ex_${testname} PROPERTIES FIXTURES_REQUIRED clear_${EXAMPLE_VARNAME}_cpp_ex) diff --git a/HDF5Examples/CXX/HL/CMakeLists.txt b/HDF5Examples/CXX/HL/CMakeLists.txt index 0e44354f2c1..a197e4d6147 100644 --- a/HDF5Examples/CXX/HL/CMakeLists.txt +++ b/HDF5Examples/CXX/HL/CMakeLists.txt @@ -21,11 +21,11 @@ if (HDF5_VERSION_MAJOR VERSION_GREATER_EQUAL "1.8") if (H5_HAVE_PARALLEL) target_include_directories (${EXAMPLE_VARNAME}_cpp_ex_${example_name} PUBLIC ${MPI_C_INCLUDE_DIRS}) endif () - target_link_libraries (${EXAMPLE_VARNAME}_cpp_ex_${example_name} ${H5EX_HDF5_LINK_LIBS}) + target_link_libraries (${EXAMPLE_VARNAME}_cpp_ex_${example_name} ${H5EXAMPLE_HDF5_LINK_LIBS}) endforeach () endif () -if (H5EX_BUILD_TESTING) +if (H5EXAMPLE_BUILD_TESTING) set (${EXAMPLE_VARNAME}_cpp_ex_CLEANFILES packet_table.h5 ) @@ -63,7 +63,7 @@ if (H5EX_BUILD_TESTING) -D "TEST_SKIP_COMPARE=TRUE" -D "TEST_OUTPUT=${testname}.out" -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) endif () set_tests_properties (${EXAMPLE_VARNAME}_cpp_ex_${testname} PROPERTIES FIXTURES_REQUIRED clear_${EXAMPLE_VARNAME}_cpp_ex) diff --git a/HDF5Examples/CXX/TUTR/CMakeLists.txt b/HDF5Examples/CXX/TUTR/CMakeLists.txt index 4205c2ba0be..b623f968336 100644 --- a/HDF5Examples/CXX/TUTR/CMakeLists.txt +++ b/HDF5Examples/CXX/TUTR/CMakeLists.txt @@ -21,11 +21,11 @@ if (HDF5_VERSION_MAJOR VERSION_GREATER_EQUAL "1.8") if (H5_HAVE_PARALLEL) target_include_directories (${EXAMPLE_VARNAME}_cpp_ex_${example_name} PUBLIC ${MPI_C_INCLUDE_DIRS}) endif () - target_link_libraries (${EXAMPLE_VARNAME}_cpp_ex_${example_name} ${H5EX_HDF5_LINK_LIBS}) + target_link_libraries (${EXAMPLE_VARNAME}_cpp_ex_${example_name} ${H5EXAMPLE_HDF5_LINK_LIBS}) endforeach () endif () -if (H5EX_BUILD_TESTING) +if (H5EXAMPLE_BUILD_TESTING) macro (ADD_H5_TEST testname) add_test ( NAME ${EXAMPLE_VARNAME}_cpp_ex_${testname}-clearall @@ -48,7 +48,7 @@ if (H5EX_BUILD_TESTING) -D "TEST_SKIP_COMPARE=TRUE" -D "TEST_OUTPUT=${testname}.out" -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) set_tests_properties (${EXAMPLE_VARNAME}_cpp_ex_${testname} PROPERTIES DEPENDS ${EXAMPLE_VARNAME}_cpp_ex_${testname}-clearall) endif () diff --git a/HDF5Examples/FORTRAN/CMakeLists.txt b/HDF5Examples/FORTRAN/CMakeLists.txt index f79a48b3665..bd4e24fbc7a 100644 --- a/HDF5Examples/FORTRAN/CMakeLists.txt +++ b/HDF5Examples/FORTRAN/CMakeLists.txt @@ -14,6 +14,6 @@ if (H5_HAVE_PARALLEL AND HDF5_PROVIDES_PARALLEL) endif () #-- Add High Level Examples -if (H5EX_BUILD_HL AND HDF5_PROVIDES_HL_LIB) +if (H5EXAMPLE_BUILD_HL AND HDF5_PROVIDES_HL_LIB) add_subdirectory (HL) endif () diff --git a/HDF5Examples/FORTRAN/H5D/CMakeLists.txt b/HDF5Examples/FORTRAN/H5D/CMakeLists.txt index e93ec709105..a73796a909f 100644 --- a/HDF5Examples/FORTRAN/H5D/CMakeLists.txt +++ b/HDF5Examples/FORTRAN/H5D/CMakeLists.txt @@ -10,7 +10,7 @@ project (HDF5Examples_FORTRAN_H5D Fortran) # Setup include Directories #----------------------------------------------------------------------------- set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES - "${CMAKE_Fortran_MODULE_DIRECTORY}${H5EX_MOD_EXT};${HDF5_F90_BINARY_DIR};${PROJECT_BINARY_DIR};${CMAKE_LIBRARY_OUTPUT_DIRECTORY}" + "${CMAKE_Fortran_MODULE_DIRECTORY}${H5EXAMPLE_MOD_EXT};${HDF5_F90_BINARY_DIR};${PROJECT_BINARY_DIR};${CMAKE_LIBRARY_OUTPUT_DIRECTORY}" ) #----------------------------------------------------------------------------- @@ -33,9 +33,9 @@ foreach (example_name ${common_examples}) if (H5_HAVE_PARALLEL) target_include_directories (${EXAMPLE_VARNAME}_f90_${example_name} PUBLIC ${MPI_Fortran_INCLUDE_DIRS}) endif () - target_link_libraries (${EXAMPLE_VARNAME}_f90_${example_name} ${H5EX_LINK_Fortran_LIBS}) + target_link_libraries (${EXAMPLE_VARNAME}_f90_${example_name} ${H5EXAMPLE_LINK_Fortran_LIBS}) set_target_properties (${EXAMPLE_VARNAME}_f90_${example_name} PROPERTIES LINKER_LANGUAGE Fortran) - if (H5EX_BUILD_TESTING) + if (H5EXAMPLE_BUILD_TESTING) if (${example_name} STREQUAL "h5ex_d_alloc") if (HDF5_VERSION_MAJOR VERSION_GREATER_EQUAL "1.14") add_custom_command ( @@ -78,9 +78,9 @@ if (HDF5_VERSION_MAJOR VERSION_GREATER_EQUAL "1.10") if (H5_HAVE_PARALLEL) target_include_directories (${EXAMPLE_VARNAME}_f90_${example_name} PUBLIC ${MPI_Fortran_INCLUDE_DIRS}) endif () - target_link_libraries (${EXAMPLE_VARNAME}_f90_${example_name} ${H5EX_LINK_Fortran_LIBS}) + target_link_libraries (${EXAMPLE_VARNAME}_f90_${example_name} ${H5EXAMPLE_LINK_Fortran_LIBS}) set_target_properties (${EXAMPLE_VARNAME}_f90_${example_name} PROPERTIES LINKER_LANGUAGE Fortran) - if (H5EX_BUILD_TESTING) + if (H5EXAMPLE_BUILD_TESTING) add_custom_command ( TARGET ${EXAMPLE_VARNAME}_f90_${example_name} POST_BUILD @@ -94,7 +94,7 @@ endif () #if (HDF5_VERSION_MAJOR VERSION_GREATER_EQUAL "1.12") # foreach (example_name ${1_12_examples}) -# if (H5EX_BUILD_TESTING) +# if (H5EXAMPLE_BUILD_TESTING) # add_custom_command ( # TARGET ${EXAMPLE_VARNAME}_f90_${example_name} # POST_BUILD @@ -106,7 +106,7 @@ endif () #endif () #if (HDF5_VERSION_MAJOR VERSION_GREATER_EQUAL "1.14") # foreach (example_name ${1_14_examples}) -# if (H5EX_BUILD_TESTING) +# if (H5EXAMPLE_BUILD_TESTING) # add_custom_command ( # TARGET ${EXAMPLE_VARNAME}_f90_${example_name} # POST_BUILD @@ -118,7 +118,7 @@ endif () #endif () #if (HDF5_VERSION_MAJOR VERSION_GREATER_EQUAL "2.0") # foreach (example_name ${2_0_examples}) -# if (H5EX_BUILD_TESTING) +# if (H5EXAMPLE_BUILD_TESTING) # add_custom_command ( # TARGET ${EXAMPLE_VARNAME}_f90_${example_name} # POST_BUILD @@ -236,7 +236,7 @@ if (HDF5_PROVIDES_TOOLS) endif () endif () -if (H5EX_BUILD_TESTING) +if (H5EXAMPLE_BUILD_TESTING) macro (ADD_H5_TEST testname) add_test ( NAME ${EXAMPLE_VARNAME}_f90_${testname}-clearall @@ -266,7 +266,7 @@ if (H5EX_BUILD_TESTING) -D "TEST_OUTPUT=${testname}.out" -D "TEST_REFERENCE=${testname}.tst" -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) if (last_test) set_tests_properties (${EXAMPLE_VARNAME}_f90_${testname} PROPERTIES DEPENDS ${last_test}) @@ -277,14 +277,14 @@ if (H5EX_BUILD_TESTING) NAME ${EXAMPLE_VARNAME}_H5DUMP-f90_${testname} COMMAND "${CMAKE_COMMAND}" -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}" - -D "TEST_PROGRAM=${H5EX_HDF5_DUMP_EXECUTABLE}" + -D "TEST_PROGRAM=${H5EXAMPLE_HDF5_DUMP_EXECUTABLE}" -D "TEST_ARGS:STRING=${ARGN};${testname}.h5" -D "TEST_FOLDER=${PROJECT_BINARY_DIR}" -D "TEST_OUTPUT=${testname}.ddl.out" -D "TEST_EXPECT=0" -D "TEST_REFERENCE=${testname}.ddl" -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) set_tests_properties (${EXAMPLE_VARNAME}_H5DUMP-f90_${testname} PROPERTIES DEPENDS ${last_test}) set (last_test "${EXAMPLE_VARNAME}_H5DUMP-f90_${testname}") diff --git a/HDF5Examples/FORTRAN/H5G/CMakeLists.txt b/HDF5Examples/FORTRAN/H5G/CMakeLists.txt index f6a16bfebcd..d2005801c38 100644 --- a/HDF5Examples/FORTRAN/H5G/CMakeLists.txt +++ b/HDF5Examples/FORTRAN/H5G/CMakeLists.txt @@ -10,7 +10,7 @@ project (HDF5Examples_FORTRAN_H5G Fortran) # Setup include Directories #----------------------------------------------------------------------------- set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES - "${CMAKE_Fortran_MODULE_DIRECTORY}${H5EX_MOD_EXT};${HDF5_F90_BINARY_DIR};${PROJECT_BINARY_DIR};${CMAKE_LIBRARY_OUTPUT_DIRECTORY}" + "${CMAKE_Fortran_MODULE_DIRECTORY}${H5EXAMPLE_MOD_EXT};${HDF5_F90_BINARY_DIR};${PROJECT_BINARY_DIR};${CMAKE_LIBRARY_OUTPUT_DIRECTORY}" ) #----------------------------------------------------------------------------- @@ -33,9 +33,9 @@ foreach (example_name ${common_examples}) if (H5_HAVE_PARALLEL) target_include_directories (${EXAMPLE_VARNAME}_f90_${example_name} PUBLIC ${MPI_Fortran_INCLUDE_DIRS}) endif () - target_link_libraries (${EXAMPLE_VARNAME}_f90_${example_name} ${H5EX_LINK_Fortran_LIBS}) + target_link_libraries (${EXAMPLE_VARNAME}_f90_${example_name} ${H5EXAMPLE_LINK_Fortran_LIBS}) set_target_properties (${EXAMPLE_VARNAME}_f90_${example_name} PROPERTIES LINKER_LANGUAGE Fortran) - if (H5EX_BUILD_TESTING) + if (H5EXAMPLE_BUILD_TESTING) if (NOT ${example_name} STREQUAL "h5ex_g_create" AND NOT ${example_name} STREQUAL "h5ex_g_compact") add_custom_command ( TARGET ${EXAMPLE_VARNAME}_f90_${example_name} @@ -47,7 +47,7 @@ foreach (example_name ${common_examples}) endif () endforeach () -#if (H5EX_ENABLE_F2003) +#if (H5EXAMPLE_ENABLE_F2003) # foreach (example_name ${f03examples}) # add_executable (${EXAMPLE_VARNAME}_f90_${example_name} ${PROJECT_SOURCE_DIR}/${example_name}.c) # target_compile_options(${EXAMPLE_VARNAME}_f90_${example_name} @@ -62,8 +62,8 @@ endforeach () # if (H5_HAVE_PARALLEL) # target_include_directories (${EXAMPLE_VARNAME}_f90_${example_name} PUBLIC ${MPI_C_INCLUDE_DIRS}) # endif () -# target_link_libraries (${EXAMPLE_VARNAME}_f90_${example_name} ${H5EX_LINK_Fortran_LIBS}) -# if (H5EX_BUILD_TESTING) +# target_link_libraries (${EXAMPLE_VARNAME}_f90_${example_name} ${H5EXAMPLE_LINK_Fortran_LIBS}) +# if (H5EXAMPLE_BUILD_TESTING) # add_custom_command ( # TARGET ${EXAMPLE_VARNAME}_f90_${example_name} # POST_BUILD @@ -76,7 +76,7 @@ endforeach () #if (HDF5_VERSION_MAJOR VERSION_GREATER_EQUAL "1.10") # foreach (example_name ${1_10_examples}) -# if (H5EX_BUILD_TESTING) +# if (H5EXAMPLE_BUILD_TESTING) # add_custom_command ( # TARGET ${EXAMPLE_VARNAME}_f90_${example_name} # POST_BUILD @@ -88,7 +88,7 @@ endforeach () #endif () #if (HDF5_VERSION_MAJOR VERSION_GREATER_EQUAL "1.12") # foreach (example_name ${1_12_examples}) -# if (H5EX_BUILD_TESTING) +# if (H5EXAMPLE_BUILD_TESTING) # add_custom_command ( # TARGET ${EXAMPLE_VARNAME}_f90_${example_name} # POST_BUILD @@ -100,7 +100,7 @@ endforeach () #endif () #if (HDF5_VERSION_MAJOR VERSION_GREATER_EQUAL "1.14") # foreach (example_name ${1_14_examples}) -# if (H5EX_BUILD_TESTING) +# if (H5EXAMPLE_BUILD_TESTING) # add_custom_command ( # TARGET ${EXAMPLE_VARNAME}_f90_${example_name} # POST_BUILD @@ -112,7 +112,7 @@ endforeach () #endif () #if (HDF5_VERSION_MAJOR VERSION_GREATER_EQUAL "2.0") # foreach (example_name ${2_0_examples}) -# if (H5EX_BUILD_TESTING) +# if (H5EXAMPLE_BUILD_TESTING) # add_custom_command ( # TARGET ${EXAMPLE_VARNAME}_f90_${example_name} # POST_BUILD @@ -149,7 +149,7 @@ if (HDF5_PROVIDES_TOOLS) ) endif () -#if (H5EX_ENABLE_F2003) +#if (H5EXAMPLE_ENABLE_F2003) # foreach (example_name ${f03examples}) # add_custom_command ( # TARGET ${EXAMPLE_VARNAME}_f90_${example_name} @@ -169,7 +169,7 @@ endif () # endforeach () #endif () -if (H5EX_BUILD_TESTING) +if (H5EXAMPLE_BUILD_TESTING) set (exfiles h5ex_g_iterate h5ex_g_traverse @@ -213,7 +213,7 @@ if (H5EX_BUILD_TESTING) -D "TEST_SKIP_COMPARE=TRUE" -D "TEST_OUTPUT=${testname}.out" -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) if (last_test) set_tests_properties (${EXAMPLE_VARNAME}_f90_${testname} PROPERTIES DEPENDS ${last_test}) @@ -224,14 +224,14 @@ if (H5EX_BUILD_TESTING) NAME ${EXAMPLE_VARNAME}_H5DUMP-f90_${testname} COMMAND "${CMAKE_COMMAND}" -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}" - -D "TEST_PROGRAM=${H5EX_HDF5_DUMP_EXECUTABLE}" + -D "TEST_PROGRAM=${H5EXAMPLE_HDF5_DUMP_EXECUTABLE}" -D "TEST_ARGS:STRING=${ARGN};${testname}.h5" -D "TEST_FOLDER=${PROJECT_BINARY_DIR}" -D "TEST_OUTPUT=${testname}.out" -D "TEST_EXPECT=0" -D "TEST_REFERENCE=${testname}.ddl" -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) set_tests_properties (${EXAMPLE_VARNAME}_H5DUMP-f90_${testname} PROPERTIES DEPENDS ${last_test}) set (last_test "${EXAMPLE_VARNAME}_H5DUMP-f90_${testname}") @@ -269,7 +269,7 @@ if (H5EX_BUILD_TESTING) -D "TEST_OUTPUT=${testname}.out" -D "TEST_REFERENCE=${testname}.tst" -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) if (last_test) set_tests_properties (${EXAMPLE_VARNAME}_f90_${testname} PROPERTIES DEPENDS ${last_test}) @@ -280,14 +280,14 @@ if (H5EX_BUILD_TESTING) NAME ${EXAMPLE_VARNAME}_H5DUMP-f90_${testname} COMMAND "${CMAKE_COMMAND}" -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}" - -D "TEST_PROGRAM=${H5EX_HDF5_DUMP_EXECUTABLE}" + -D "TEST_PROGRAM=${H5EXAMPLE_HDF5_DUMP_EXECUTABLE}" -D "TEST_ARGS:STRING=${ARGN};${testname}.h5" -D "TEST_FOLDER=${PROJECT_BINARY_DIR}" -D "TEST_OUTPUT=${testname}.ddl.out" -D "TEST_EXPECT=0" -D "TEST_REFERENCE=${testname}.ddl" -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) set_tests_properties (${EXAMPLE_VARNAME}_H5DUMP-f90_${testname} PROPERTIES DEPENDS ${last_test}) set (last_test "${EXAMPLE_VARNAME}_H5DUMP-f90_${testname}") @@ -334,7 +334,7 @@ if (H5EX_BUILD_TESTING) -D "TEST_SKIP_COMPARE=TRUE" -D "TEST_OUTPUT=${testname}.out" -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) else () add_test ( @@ -348,7 +348,7 @@ if (H5EX_BUILD_TESTING) -D "TEST_OUTPUT=${testname}.out" -D "TEST_REFERENCE=${testname}.tst" -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) endif () set_tests_properties (${EXAMPLE_VARNAME}_f90_${testname} PROPERTIES DEPENDS ${EXAMPLE_VARNAME}_f90_${testname}-clearall) @@ -357,28 +357,28 @@ if (H5EX_BUILD_TESTING) NAME ${EXAMPLE_VARNAME}_H5DUMP-f90_${testname}1 COMMAND "${CMAKE_COMMAND}" -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}" - -D "TEST_PROGRAM=${H5EX_HDF5_DUMP_EXECUTABLE}" + -D "TEST_PROGRAM=${H5EXAMPLE_HDF5_DUMP_EXECUTABLE}" -D "TEST_ARGS:STRING=${testname}1.h5" -D "TEST_FOLDER=${PROJECT_BINARY_DIR}" -D "TEST_OUTPUT=${testname}1.ddl.out" -D "TEST_EXPECT=0" -D "TEST_REFERENCE=${testname}1.ddl" -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) set_tests_properties (${EXAMPLE_VARNAME}_H5DUMP-f90_${testname}1 PROPERTIES DEPENDS ${EXAMPLE_VARNAME}_f90_${testname}) add_test ( NAME ${EXAMPLE_VARNAME}_H5DUMP-f90_${testname}2 COMMAND "${CMAKE_COMMAND}" -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}" - -D "TEST_PROGRAM=${H5EX_HDF5_DUMP_EXECUTABLE}" + -D "TEST_PROGRAM=${H5EXAMPLE_HDF5_DUMP_EXECUTABLE}" -D "TEST_ARGS:STRING=${testname}2.h5" -D "TEST_FOLDER=${PROJECT_BINARY_DIR}" -D "TEST_OUTPUT=${testname}2.ddl.out" -D "TEST_EXPECT=0" -D "TEST_REFERENCE=${testname}2.ddl" -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) set_tests_properties (${EXAMPLE_VARNAME}_H5DUMP-f90_${testname}2 PROPERTIES DEPENDS ${EXAMPLE_VARNAME}_H5DUMP-f90_${testname}1) endif () @@ -406,7 +406,7 @@ if (H5EX_BUILD_TESTING) -D "TEST_OUTPUT=${testname}.out" -D "TEST_REFERENCE=${testname}.tst" -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) endif () set_tests_properties (${EXAMPLE_VARNAME}_f90_${testname} PROPERTIES DEPENDS ${EXAMPLE_VARNAME}_f90_${testname}-clearall) @@ -432,7 +432,7 @@ if (H5EX_BUILD_TESTING) #ADD_H5_CMP_TEST (h5ex_g_traverse) #endif() else () - if (H5EX_ENABLE_F2003) + if (H5EXAMPLE_ENABLE_F2003) ADD_H5_CMP_TEST (h5ex_g_intermediate) ADD_H5_CMP_TEST (h5ex_g_iterate) # ADD_H5_CMP_TEST (h5ex_g_traverse) diff --git a/HDF5Examples/FORTRAN/H5G/Fortran_sourcefiles.cmake b/HDF5Examples/FORTRAN/H5G/Fortran_sourcefiles.cmake index f5586e61f8c..9ea3211b56e 100644 --- a/HDF5Examples/FORTRAN/H5G/Fortran_sourcefiles.cmake +++ b/HDF5Examples/FORTRAN/H5G/Fortran_sourcefiles.cmake @@ -23,7 +23,7 @@ if (HDF5_VERSION_STRING VERSION_GREATER_EQUAL "1.10.0") ) endif() else () - if (H5EX_ENABLE_F2003) + if (H5EXAMPLE_ENABLE_F2003) set (common_examples ${common_examples} h5ex_g_intermediate diff --git a/HDF5Examples/FORTRAN/H5PAR/CMakeLists.txt b/HDF5Examples/FORTRAN/H5PAR/CMakeLists.txt index d2b311e9993..fc818f84b35 100644 --- a/HDF5Examples/FORTRAN/H5PAR/CMakeLists.txt +++ b/HDF5Examples/FORTRAN/H5PAR/CMakeLists.txt @@ -10,7 +10,7 @@ project (HDF5Examples_FORTRAN_H5PAR Fortran) # Setup include Directories #----------------------------------------------------------------------------- set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES - "${CMAKE_Fortran_MODULE_DIRECTORY}${H5EX_MOD_EXT};${HDF5_F90_BINARY_DIR};${PROJECT_BINARY_DIR};${CMAKE_LIBRARY_OUTPUT_DIRECTORY}" + "${CMAKE_Fortran_MODULE_DIRECTORY}${H5EXAMPLE_MOD_EXT};${HDF5_F90_BINARY_DIR};${PROJECT_BINARY_DIR};${CMAKE_LIBRARY_OUTPUT_DIRECTORY}" ) #----------------------------------------------------------------------------- @@ -31,11 +31,11 @@ foreach (example_name ${examples}) "$<$:-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} ${H5EX_LINK_Fortran_LIBS}) + 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 () -if (H5EX_BUILD_TESTING) +if (H5EXAMPLE_BUILD_TESTING) macro (ADD_GREP_TEST testname mumprocs) add_test ( NAME MPI_TEST_${EXAMPLE_VARNAME}_f90_${testname}-clearall @@ -53,7 +53,7 @@ if (H5EX_BUILD_TESTING) -D "TEST_GREP_COMPARE=TRUE" -D "TEST_REFERENCE:STRING=PHDF5 example finished with no errors" -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) set_tests_properties (MPI_TEST_${EXAMPLE_VARNAME}_f90_${testname} PROPERTIES DEPENDS MPI_TEST_${EXAMPLE_VARNAME}_f90_${testname}-clearall) add_test ( diff --git a/HDF5Examples/FORTRAN/H5T/CMakeLists.txt b/HDF5Examples/FORTRAN/H5T/CMakeLists.txt index ae380cb0b5a..adcc2d49f95 100644 --- a/HDF5Examples/FORTRAN/H5T/CMakeLists.txt +++ b/HDF5Examples/FORTRAN/H5T/CMakeLists.txt @@ -5,7 +5,7 @@ project (HDF5Examples_FORTRAN_H5T Fortran) # Setup include Directories #----------------------------------------------------------------------------- set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES - "${CMAKE_Fortran_MODULE_DIRECTORY}${H5EX_MOD_EXT};${HDF5_F90_BINARY_DIR};${PROJECT_BINARY_DIR};${CMAKE_LIBRARY_OUTPUT_DIRECTORY}" + "${CMAKE_Fortran_MODULE_DIRECTORY}${H5EXAMPLE_MOD_EXT};${HDF5_F90_BINARY_DIR};${PROJECT_BINARY_DIR};${CMAKE_LIBRARY_OUTPUT_DIRECTORY}" ) #----------------------------------------------------------------------------- @@ -13,7 +13,7 @@ set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES #----------------------------------------------------------------------------- include (Fortran_sourcefiles.cmake) -#if (H5EX_ENABLE_F2003) +#if (H5EXAMPLE_ENABLE_F2003) foreach (example_name ${f03_examples}) add_executable (${EXAMPLE_VARNAME}_f90_${example_name} ${PROJECT_SOURCE_DIR}/${example_name}.F90) target_compile_options(${EXAMPLE_VARNAME}_f90_${example_name} @@ -28,9 +28,9 @@ include (Fortran_sourcefiles.cmake) if (H5_HAVE_PARALLEL) target_include_directories (${EXAMPLE_VARNAME}_f90_${example_name} PUBLIC ${MPI_Fortran_INCLUDE_DIRS}) endif () - target_link_libraries (${EXAMPLE_VARNAME}_f90_${example_name} ${H5EX_LINK_Fortran_LIBS}) + target_link_libraries (${EXAMPLE_VARNAME}_f90_${example_name} ${H5EXAMPLE_LINK_Fortran_LIBS}) set_target_properties (${EXAMPLE_VARNAME}_f90_${example_name} PROPERTIES LINKER_LANGUAGE Fortran) - if (H5EX_BUILD_TESTING) + if (H5EXAMPLE_BUILD_TESTING) add_custom_command ( TARGET ${EXAMPLE_VARNAME}_f90_${example_name} POST_BUILD @@ -55,9 +55,9 @@ foreach (example_name ${common_examples}) if (H5_HAVE_PARALLEL) target_include_directories (${EXAMPLE_VARNAME}_f90_${example_name} PUBLIC ${MPI_Fortran_INCLUDE_DIRS}) endif () - target_link_libraries (${EXAMPLE_VARNAME}_f90_${example_name} ${H5EX_LINK_Fortran_LIBS}) + target_link_libraries (${EXAMPLE_VARNAME}_f90_${example_name} ${H5EXAMPLE_LINK_Fortran_LIBS}) set_target_properties (${EXAMPLE_VARNAME}_f90_${example_name} PROPERTIES LINKER_LANGUAGE Fortran) - if (H5EX_BUILD_TESTING) + if (H5EXAMPLE_BUILD_TESTING) add_custom_command ( TARGET ${EXAMPLE_VARNAME}_f90_${example_name} POST_BUILD @@ -69,7 +69,7 @@ endforeach () #if (HDF5_VERSION_MAJOR VERSION_GREATER_EQUAL "1.10") # foreach (example_name ${1_10_examples}) -# if (H5EX_BUILD_TESTING) +# if (H5EXAMPLE_BUILD_TESTING) # add_custom_command ( # TARGET ${EXAMPLE_VARNAME}_f90_${example_name} # POST_BUILD @@ -81,7 +81,7 @@ endforeach () #endif () #if (HDF5_VERSION_MAJOR VERSION_GREATER_EQUAL "1.12") # foreach (example_name ${1_12_examples}) -# if (H5EX_BUILD_TESTING) +# if (H5EXAMPLE_BUILD_TESTING) # add_custom_command ( # TARGET ${EXAMPLE_VARNAME}_f90_${example_name} # POST_BUILD @@ -93,7 +93,7 @@ endforeach () #endif () #if (HDF5_VERSION_MAJOR VERSION_GREATER_EQUAL "1.14") # foreach (example_name ${1_14_examples}) -# if (H5EX_BUILD_TESTING) +# if (H5EXAMPLE_BUILD_TESTING) # add_custom_command ( # TARGET ${EXAMPLE_VARNAME}_f90_${example_name} # POST_BUILD @@ -105,7 +105,7 @@ endforeach () #endif () #if (HDF5_VERSION_MAJOR VERSION_GREATER_EQUAL "2.0") # foreach (example_name ${2_0_examples}) -# if (H5EX_BUILD_TESTING) +# if (H5EXAMPLE_BUILD_TESTING) # add_custom_command ( # TARGET ${EXAMPLE_VARNAME}_f90_${example_name} # POST_BUILD @@ -126,7 +126,7 @@ if (HDF5_PROVIDES_TOOLS) ) endforeach () - #if (H5EX_ENABLE_F2003) + #if (H5EXAMPLE_ENABLE_F2003) foreach (example_name ${f03_examples}) if (NOT ${example_name} STREQUAL "h5ex_t_convert_F03") if (${example_name} STREQUAL "h5ex_t_vlen_F03" OR ${example_name} STREQUAL "h5ex_t_vlenatt_F03") @@ -297,7 +297,7 @@ if (HDF5_PROVIDES_TOOLS) # endforeach () endif () -if (H5EX_BUILD_TESTING) +if (H5EXAMPLE_BUILD_TESTING) macro (ADD_H5_TEST testname) add_test ( NAME ${EXAMPLE_VARNAME}_f90_${testname}-clearall @@ -327,7 +327,7 @@ if (H5EX_BUILD_TESTING) -D "TEST_OUTPUT=${testname}.out" -D "TEST_REFERENCE=${testname}.tst" -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) if (last_test) set_tests_properties (${EXAMPLE_VARNAME}_f90_${testname} PROPERTIES DEPENDS ${last_test}) @@ -338,14 +338,14 @@ if (H5EX_BUILD_TESTING) NAME ${EXAMPLE_VARNAME}_H5DUMP-f90_${testname} COMMAND "${CMAKE_COMMAND}" -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}" - -D "TEST_PROGRAM=${H5EX_HDF5_DUMP_EXECUTABLE}" + -D "TEST_PROGRAM=${H5EXAMPLE_HDF5_DUMP_EXECUTABLE}" -D "TEST_ARGS:STRING=${ARGN};${testname}.h5" -D "TEST_FOLDER=${PROJECT_BINARY_DIR}" -D "TEST_OUTPUT=${testname}.ddl.out" -D "TEST_EXPECT=0" -D "TEST_REFERENCE=${testname}.ddl" -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) set_tests_properties (${EXAMPLE_VARNAME}_H5DUMP-f90_${testname} PROPERTIES DEPENDS ${last_test}) set (last_test "${EXAMPLE_VARNAME}_H5DUMP-f90_${testname}") @@ -381,7 +381,7 @@ if (H5EX_BUILD_TESTING) -D "TEST_OUTPUT=${testname}.out" -D "TEST_REFERENCE=${testname}.tst" -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) endif () set_tests_properties (${EXAMPLE_VARNAME}_f90_${testname} PROPERTIES DEPENDS ${EXAMPLE_VARNAME}_f90_${testname}-clearall) @@ -404,7 +404,7 @@ if (H5EX_BUILD_TESTING) endif () endmacro () - #if (H5EX_ENABLE_F2003) + #if (H5EXAMPLE_ENABLE_F2003) foreach (example_name ${f03_examples} ${common_examples}) TEST_EXAMPLE (${example_name}) endforeach () diff --git a/HDF5Examples/FORTRAN/HL/CMakeLists.txt b/HDF5Examples/FORTRAN/HL/CMakeLists.txt index 7a8b8d13514..4decd76f9b9 100644 --- a/HDF5Examples/FORTRAN/HL/CMakeLists.txt +++ b/HDF5Examples/FORTRAN/HL/CMakeLists.txt @@ -10,7 +10,7 @@ project (HDF5Examples_FORTRAN_HL Fortran) # Setup include Directories #----------------------------------------------------------------------------- set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES - "${CMAKE_Fortran_MODULE_DIRECTORY}${H5EX_MOD_EXT};${HDF5_F90_BINARY_DIR};${PROJECT_BINARY_DIR};${CMAKE_LIBRARY_OUTPUT_DIRECTORY}" + "${CMAKE_Fortran_MODULE_DIRECTORY}${H5EXAMPLE_MOD_EXT};${HDF5_F90_BINARY_DIR};${PROJECT_BINARY_DIR};${CMAKE_LIBRARY_OUTPUT_DIRECTORY}" ) #----------------------------------------------------------------------------- @@ -33,9 +33,9 @@ foreach (example_name ${f03_examples}) if (H5_HAVE_PARALLEL) target_include_directories (${EXAMPLE_VARNAME}_f90_${example_name} PUBLIC ${MPI_Fortran_INCLUDE_DIRS}) endif () - target_link_libraries (${EXAMPLE_VARNAME}_f90_${example_name} ${H5EX_LINK_Fortran_LIBS}) + target_link_libraries (${EXAMPLE_VARNAME}_f90_${example_name} ${H5EXAMPLE_LINK_Fortran_LIBS}) set_target_properties (${EXAMPLE_VARNAME}_f90_${example_name} PROPERTIES LINKER_LANGUAGE Fortran) - if (H5EX_BUILD_TESTING) + if (H5EXAMPLE_BUILD_TESTING) add_custom_command ( TARGET ${EXAMPLE_VARNAME}_f90_${example_name} POST_BUILD @@ -45,7 +45,7 @@ foreach (example_name ${f03_examples}) endif () endforeach () -#if (H5EX_ENABLE_F2003) +#if (H5EXAMPLE_ENABLE_F2003) # foreach (example_name ${f03examples}) # add_executable (${EXAMPLE_VARNAME}_f90_${example_name} ${PROJECT_SOURCE_DIR}/${example_name}.c) # target_compile_options(${EXAMPLE_VARNAME}_f90_${example_name} @@ -60,8 +60,8 @@ endforeach () # if (H5_HAVE_PARALLEL) # target_include_directories (${EXAMPLE_VARNAME}_f90_${example_name} PUBLIC ${MPI_C_INCLUDE_DIRS}) # endif () -# target_link_libraries (${EXAMPLE_VARNAME}_f90_${example_name} ${H5EX_LINK_Fortran_LIBS}) -# if (H5EX_BUILD_TESTING) +# target_link_libraries (${EXAMPLE_VARNAME}_f90_${example_name} ${H5EXAMPLE_LINK_Fortran_LIBS}) +# if (H5EXAMPLE_BUILD_TESTING) # add_custom_command ( # TARGET ${EXAMPLE_VARNAME}_f90_${example_name} # POST_BUILD @@ -74,7 +74,7 @@ endforeach () #if (HDF5_VERSION_MAJOR VERSION_GREATER_EQUAL "1.10") # foreach (example_name ${1_10_examples}) -# if (H5EX_BUILD_TESTING) +# if (H5EXAMPLE_BUILD_TESTING) # add_custom_command ( # TARGET ${EXAMPLE_VARNAME}_f90_${example_name} # POST_BUILD @@ -86,7 +86,7 @@ endforeach () #endif () #if (HDF5_VERSION_MAJOR VERSION_GREATER_EQUAL "1.12") # foreach (example_name ${1_12_examples}) -# if (H5EX_BUILD_TESTING) +# if (H5EXAMPLE_BUILD_TESTING) # add_custom_command ( # TARGET ${EXAMPLE_VARNAME}_f90_${example_name} # POST_BUILD @@ -98,7 +98,7 @@ endforeach () #endif () #if (HDF5_VERSION_MAJOR VERSION_GREATER_EQUAL "1.14") # foreach (example_name ${1_14_examples}) -# if (H5EX_BUILD_TESTING) +# if (H5EXAMPLE_BUILD_TESTING) # add_custom_command ( # TARGET ${EXAMPLE_VARNAME}_f90_${example_name} # POST_BUILD @@ -110,7 +110,7 @@ endforeach () #endif () #if (HDF5_VERSION_MAJOR VERSION_GREATER_EQUAL "2.0") # foreach (example_name ${2_0_examples}) -# if (H5EX_BUILD_TESTING) +# if (H5EXAMPLE_BUILD_TESTING) # add_custom_command ( # TARGET ${EXAMPLE_VARNAME}_f90_${example_name} # POST_BUILD @@ -132,7 +132,7 @@ endforeach () # endforeach () #endif () -#if (H5EX_ENABLE_F2003) +#if (H5EXAMPLE_ENABLE_F2003) foreach (example_name ${f03examples}) add_custom_command ( TARGET ${EXAMPLE_VARNAME}_f90_${example_name} @@ -152,7 +152,7 @@ endforeach () # endforeach () #endif () -if (H5EX_BUILD_TESTING) +if (H5EXAMPLE_BUILD_TESTING) macro (ADD_DUMP_TEST testname) add_test ( NAME ${EXAMPLE_VARNAME}_f90_${testname}-clearall @@ -182,7 +182,7 @@ if (H5EX_BUILD_TESTING) -D "TEST_OUTPUT=${testname}.out" -D "TEST_REFERENCE=${testname}.tst" -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) if (last_test) set_tests_properties (${EXAMPLE_VARNAME}_f90_${testname} PROPERTIES DEPENDS ${last_test}) @@ -193,7 +193,7 @@ if (H5EX_BUILD_TESTING) NAME ${EXAMPLE_VARNAME}_H5DUMP-f90_${testname} COMMAND "${CMAKE_COMMAND}" -D "TEST_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}" - -D "TEST_PROGRAM=${H5EX_HDF5_DUMP_EXECUTABLE}" + -D "TEST_PROGRAM=${H5EXAMPLE_HDF5_DUMP_EXECUTABLE}" -D "TEST_ARGS:STRING=${ARGN};${testname}.h5" -D "TEST_FOLDER=${PROJECT_BINARY_DIR}" -D "TEST_OUTPUT=${testname}.ddl.out" @@ -201,7 +201,7 @@ if (H5EX_BUILD_TESTING) -D "TEST_SKIP_COMPARE=TRUE" #-D "TEST_REFERENCE=${testname}.ddl" -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) set_tests_properties (${EXAMPLE_VARNAME}_H5DUMP-f90_${testname} PROPERTIES DEPENDS ${last_test}) set (last_test "${EXAMPLE_VARNAME}_H5DUMP-f90_${testname}") diff --git a/HDF5Examples/FORTRAN/TUTR/CMakeLists.txt b/HDF5Examples/FORTRAN/TUTR/CMakeLists.txt index e7307fbff4d..28a075eda63 100644 --- a/HDF5Examples/FORTRAN/TUTR/CMakeLists.txt +++ b/HDF5Examples/FORTRAN/TUTR/CMakeLists.txt @@ -5,7 +5,7 @@ project (HDF5Examples_FORTRAN_TUTR Fortran) # Setup include Directories #----------------------------------------------------------------------------- set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES - "${CMAKE_Fortran_MODULE_DIRECTORY}${H5EX_MOD_EXT};${HDF5_F90_BINARY_DIR};${PROJECT_BINARY_DIR};${CMAKE_LIBRARY_OUTPUT_DIRECTORY}" + "${CMAKE_Fortran_MODULE_DIRECTORY}${H5EXAMPLE_MOD_EXT};${HDF5_F90_BINARY_DIR};${PROJECT_BINARY_DIR};${CMAKE_LIBRARY_OUTPUT_DIRECTORY}" ) #----------------------------------------------------------------------------- @@ -13,7 +13,7 @@ set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES #----------------------------------------------------------------------------- include (Fortran_sourcefiles.cmake) -#if (H5EX_ENABLE_F2003) +#if (H5EXAMPLE_ENABLE_F2003) foreach (example_name ${f03_examples}) add_executable (${EXAMPLE_VARNAME}_f90_tutr_${example_name} ${PROJECT_SOURCE_DIR}/${example_name}.f90) target_compile_options(${EXAMPLE_VARNAME}_f90_tutr_${example_name} @@ -28,7 +28,7 @@ include (Fortran_sourcefiles.cmake) if (H5_HAVE_PARALLEL) target_include_directories (${EXAMPLE_VARNAME}_f90_tutr_${example_name} PUBLIC ${MPI_Fortran_INCLUDE_DIRS}) endif () - target_link_libraries (${EXAMPLE_VARNAME}_f90_tutr_${example_name} ${H5EX_LINK_Fortran_LIBS}) + target_link_libraries (${EXAMPLE_VARNAME}_f90_tutr_${example_name} ${H5EXAMPLE_LINK_Fortran_LIBS}) set_target_properties (${EXAMPLE_VARNAME}_f90_tutr_${example_name} PROPERTIES LINKER_LANGUAGE Fortran) endforeach () #endif () @@ -47,11 +47,11 @@ foreach (example_name ${common_examples}) if (H5_HAVE_PARALLEL) target_include_directories (${EXAMPLE_VARNAME}_f90_tutr_${example_name} PUBLIC ${MPI_Fortran_INCLUDE_DIRS}) endif () - target_link_libraries (${EXAMPLE_VARNAME}_f90_tutr_${example_name} ${H5EX_LINK_Fortran_LIBS}) + target_link_libraries (${EXAMPLE_VARNAME}_f90_tutr_${example_name} ${H5EXAMPLE_LINK_Fortran_LIBS}) set_target_properties (${EXAMPLE_VARNAME}_f90_tutr_${example_name} PROPERTIES LINKER_LANGUAGE Fortran) endforeach () -if (H5EX_BUILD_TESTING) +if (H5EXAMPLE_BUILD_TESTING) set (${EXAMPLE_VARNAME}_f90_tutr_CLEANFILES compound.h5 copy1.h5 @@ -102,7 +102,7 @@ if (H5EX_BUILD_TESTING) -D "TEST_SKIP_COMPARE=TRUE" -D "TEST_OUTPUT=${testname}.out" -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) endif () set_tests_properties (${EXAMPLE_VARNAME}_f90_tutr_${testname} PROPERTIES FIXTURES_REQUIRED clear_${EXAMPLE_VARNAME}_f90_tutr) @@ -112,7 +112,7 @@ if (H5EX_BUILD_TESTING) set (last_test "${EXAMPLE_VARNAME}_f90_tutr_${testname}") endmacro () - #if (H5EX_ENABLE_F2003) + #if (H5EXAMPLE_ENABLE_F2003) foreach (example_name ${f03_examples} ${common_examples}) ADD_H5_TEST (${example_name}) endforeach () diff --git a/HDF5Examples/JAVA/H5D/CMakeLists.txt b/HDF5Examples/JAVA/H5D/CMakeLists.txt index cef96e3a303..9bb1aaca0d6 100644 --- a/HDF5Examples/JAVA/H5D/CMakeLists.txt +++ b/HDF5Examples/JAVA/H5D/CMakeLists.txt @@ -18,7 +18,7 @@ set (CMAKE_JAVA_INCLUDE_PATH ".") foreach (CMAKE_JINCLUDE_PATH ${HDF5_JAVA_INCLUDE_DIRS}) set (CMAKE_JAVA_INCLUDE_PATH "${CMAKE_JAVA_INCLUDE_PATH}${CMAKE_JAVA_INCLUDE_FLAG_SEP}${CMAKE_JINCLUDE_PATH}") endforeach () -set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=${H5EX_JAVA_LIBRARY}$<$,$>:${CMAKE_DEBUG_POSTFIX}>;") +set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=${H5EXAMPLE_JAVA_LIBRARY}$<$,$>:${CMAKE_DEBUG_POSTFIX}>;") set (CMAKE_JAVA_CLASSPATH ".") foreach (CMAKE_INCLUDE_PATH ${HDF5_JAVA_INCLUDE_DIRS}) @@ -43,10 +43,10 @@ Class-Path: ${HDFJAVA_CLASSJARS} ) get_target_property (${EXAMPLE_VARNAME}J_${example_name}_JAR_FILE ${EXAMPLE_VARNAME}J_${example_name} JAR_FILE) get_target_property (${EXAMPLE_VARNAME}J_${example_name}_CLASSPATH ${EXAMPLE_VARNAME}J_${example_name} CLASSDIR) - add_dependencies (${EXAMPLE_VARNAME}J_${example_name} ${H5EX_JAVA_LIBRARIES}) + add_dependencies (${EXAMPLE_VARNAME}J_${example_name} ${H5EXAMPLE_JAVA_LIBRARIES}) endforeach () -if (H5EX_BUILD_TESTING) +if (H5EXAMPLE_BUILD_TESTING) macro (ADD_H5_TEST resultfile resultcode) add_test ( NAME ${EXAMPLE_VARNAME}_jnative-h5-${resultfile} @@ -61,7 +61,7 @@ if (H5EX_BUILD_TESTING) -D "TEST_REFERENCE=${resultfile}.txt" -D "TEST_EXPECT=${resultcode}" -D "TEST_SKIP_COMPARE=TRUE" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) if (NOT "${last_test}" STREQUAL "") set_tests_properties (${EXAMPLE_VARNAME}_jnative-h5-${resultfile} PROPERTIES DEPENDS ${last_test}) diff --git a/HDF5Examples/JAVA/H5G/CMakeLists.txt b/HDF5Examples/JAVA/H5G/CMakeLists.txt index 3aec13399ab..85d62ede252 100644 --- a/HDF5Examples/JAVA/H5G/CMakeLists.txt +++ b/HDF5Examples/JAVA/H5G/CMakeLists.txt @@ -18,7 +18,7 @@ set (CMAKE_JAVA_INCLUDE_PATH ".") foreach (CMAKE_JINCLUDE_PATH ${HDF5_JAVA_INCLUDE_DIRS}) set (CMAKE_JAVA_INCLUDE_PATH "${CMAKE_JAVA_INCLUDE_PATH}${CMAKE_JAVA_INCLUDE_FLAG_SEP}${CMAKE_JINCLUDE_PATH}") endforeach () -set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=${H5EX_JAVA_LIBRARY}$<$,$>:${CMAKE_DEBUG_POSTFIX}>;") +set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=${H5EXAMPLE_JAVA_LIBRARY}$<$,$>:${CMAKE_DEBUG_POSTFIX}>;") set (CMAKE_JAVA_CLASSPATH ".") foreach (CMAKE_INCLUDE_PATH ${HDF5_JAVA_INCLUDE_DIRS}) @@ -43,10 +43,10 @@ Class-Path: ${HDFJAVA_CLASSJARS} ) get_target_property (${EXAMPLE_VARNAME}J_${example_name}_JAR_FILE ${EXAMPLE_VARNAME}J_${example_name} JAR_FILE) get_target_property (${EXAMPLE_VARNAME}J_${example_name}_CLASSPATH ${EXAMPLE_VARNAME}J_${example_name} CLASSDIR) - add_dependencies (${EXAMPLE_VARNAME}J_${example_name} ${H5EX_JAVA_LIBRARIES}) + add_dependencies (${EXAMPLE_VARNAME}J_${example_name} ${H5EXAMPLE_JAVA_LIBRARIES}) endforeach () -if (H5EX_BUILD_TESTING) +if (H5EXAMPLE_BUILD_TESTING) macro (ADD_H5_TEST resultfile resultcode) add_test ( NAME ${EXAMPLE_VARNAME}_jnative-h5-${resultfile} @@ -61,7 +61,7 @@ if (H5EX_BUILD_TESTING) -D "TEST_REFERENCE=${resultfile}.txt" -D "TEST_EXPECT=${resultcode}" -D "TEST_SKIP_COMPARE=TRUE" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) if (NOT "${last_test}" STREQUAL "") set_tests_properties (${EXAMPLE_VARNAME}_jnative-h5-${resultfile} PROPERTIES DEPENDS ${last_test}) diff --git a/HDF5Examples/JAVA/H5T/CMakeLists.txt b/HDF5Examples/JAVA/H5T/CMakeLists.txt index be7d4c64fa2..806274459a5 100644 --- a/HDF5Examples/JAVA/H5T/CMakeLists.txt +++ b/HDF5Examples/JAVA/H5T/CMakeLists.txt @@ -18,7 +18,7 @@ set (CMAKE_JAVA_INCLUDE_PATH ".") foreach (CMAKE_JINCLUDE_PATH ${HDF5_JAVA_INCLUDE_DIRS}) set (CMAKE_JAVA_INCLUDE_PATH "${CMAKE_JAVA_INCLUDE_PATH}${CMAKE_JAVA_INCLUDE_FLAG_SEP}${CMAKE_JINCLUDE_PATH}") endforeach () -set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=${H5EX_JAVA_LIBRARY}$<$,$>:${CMAKE_DEBUG_POSTFIX}>;") +set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=${H5EXAMPLE_JAVA_LIBRARY}$<$,$>:${CMAKE_DEBUG_POSTFIX}>;") set (CMAKE_JAVA_CLASSPATH ".") foreach (CMAKE_INCLUDE_PATH ${HDF5_JAVA_INCLUDE_DIRS}) @@ -43,10 +43,10 @@ Class-Path: ${HDFJAVA_CLASSJARS} ) get_target_property (${EXAMPLE_VARNAME}J_${example_name}_JAR_FILE ${EXAMPLE_VARNAME}J_${example_name} JAR_FILE) get_target_property (${EXAMPLE_VARNAME}J_${example_name}_CLASSPATH ${EXAMPLE_VARNAME}J_${example_name} CLASSDIR) - add_dependencies (${EXAMPLE_VARNAME}J_${example_name} ${H5EX_JAVA_LIBRARIES}) + add_dependencies (${EXAMPLE_VARNAME}J_${example_name} ${H5EXAMPLE_JAVA_LIBRARIES}) endforeach () -if (H5EX_BUILD_TESTING) +if (H5EXAMPLE_BUILD_TESTING) macro (ADD_H5_TEST resultfile resultcode) add_test ( NAME ${EXAMPLE_VARNAME}_jnative-h5-${resultfile} @@ -61,7 +61,7 @@ if (H5EX_BUILD_TESTING) -D "TEST_REFERENCE=${resultfile}.txt" -D "TEST_EXPECT=${resultcode}" -D "TEST_SKIP_COMPARE=TRUE" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) if (NOT "${last_test}" STREQUAL "") set_tests_properties (${EXAMPLE_VARNAME}_jnative-h5-${resultfile} PROPERTIES DEPENDS ${last_test}) diff --git a/HDF5Examples/JAVA/TUTR/CMakeLists.txt b/HDF5Examples/JAVA/TUTR/CMakeLists.txt index 4c3f09325ec..4f5aef0e66d 100644 --- a/HDF5Examples/JAVA/TUTR/CMakeLists.txt +++ b/HDF5Examples/JAVA/TUTR/CMakeLists.txt @@ -18,7 +18,7 @@ set (CMAKE_JAVA_INCLUDE_PATH ".") foreach (CMAKE_JINCLUDE_PATH ${HDF5_JAVA_INCLUDE_DIRS}) set (CMAKE_JAVA_INCLUDE_PATH "${CMAKE_JAVA_INCLUDE_PATH}${CMAKE_JAVA_INCLUDE_FLAG_SEP}${CMAKE_JINCLUDE_PATH}") endforeach () -set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=${H5EX_JAVA_LIBRARY}$<$,$>:${CMAKE_DEBUG_POSTFIX}>;") +set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=${H5EXAMPLE_JAVA_LIBRARY}$<$,$>:${CMAKE_DEBUG_POSTFIX}>;") set (CMAKE_JAVA_CLASSPATH ".") foreach (CMAKE_INCLUDE_PATH ${HDF5_JAVA_INCLUDE_DIRS}) @@ -43,10 +43,10 @@ Class-Path: ${HDFJAVA_CLASSJARS} ) get_target_property (${EXAMPLE_VARNAME}J_${example_name}_JAR_FILE ${EXAMPLE_VARNAME}J_${example_name} JAR_FILE) get_target_property (${EXAMPLE_VARNAME}J_${example_name}_CLASSPATH ${EXAMPLE_VARNAME}J_${example_name} CLASSDIR) - add_dependencies (${EXAMPLE_VARNAME}J_${example_name} ${H5EX_JAVA_LIBRARIES}) + add_dependencies (${EXAMPLE_VARNAME}J_${example_name} ${H5EXAMPLE_JAVA_LIBRARIES}) endforeach () -if (H5EX_BUILD_TESTING) +if (H5EXAMPLE_BUILD_TESTING) macro (ADD_H5_TEST resultfile resultcode) add_test ( NAME ${EXAMPLE_VARNAME}_jnative-h5-${resultfile} @@ -61,7 +61,7 @@ if (H5EX_BUILD_TESTING) -D "TEST_REFERENCE=${resultfile}.txt" -D "TEST_EXPECT=${resultcode}" -D "TEST_SKIP_COMPARE=TRUE" - -P "${H5EX_RESOURCES_DIR}/runTest.cmake" + -P "${H5EXAMPLE_RESOURCES_DIR}/runTest.cmake" ) if (NOT "${last_test}" STREQUAL "") set_tests_properties (${EXAMPLE_VARNAME}_jnative-h5-${resultfile} PROPERTIES DEPENDS ${last_test}) diff --git a/HDF5Examples/PYTHON/CMakeLists.txt b/HDF5Examples/PYTHON/CMakeLists.txt index a35b12bcc45..2f5f58369e1 100644 --- a/HDF5Examples/PYTHON/CMakeLists.txt +++ b/HDF5Examples/PYTHON/CMakeLists.txt @@ -6,7 +6,7 @@ project (HDF5Examples_PYTHON) #----------------------------------------------------------------------------- include (Py_sourcefiles.cmake) -if (H5EX_BUILD_TESTING) +if (H5EXAMPLE_BUILD_TESTING) set (${EXAMPLE_VARNAME}_PY_CLEANFILES compound.h5 dset.h5 diff --git a/HDF5Examples/Using_CMake.txt b/HDF5Examples/Using_CMake.txt index c10b24007a6..6f6b6bca29f 100644 --- a/HDF5Examples/Using_CMake.txt +++ b/HDF5Examples/Using_CMake.txt @@ -184,17 +184,17 @@ II. Building HDF5 Examples with CMake * ... [Win32, x64, ARM, ARM64] is: - * H5EX_BUILD_TESTING:BOOL=ON + * H5EXAMPLE_BUILD_TESTING:BOOL=ON * BUILD_SHARED_LIBS:BOOL=[ON | OFF] - * H5EX_BUILD_FORTRAN:BOOL=[ON | OFF] - * H5EX_BUILD_JAVA:BOOL=[ON | OFF] + * H5EXAMPLE_BUILD_FORTRAN:BOOL=[ON | OFF] + * H5EXAMPLE_BUILD_JAVA:BOOL=[ON | OFF] if the hdf5 library was built with a namespace (i.e. "hdf5::") add: -D HDF5_NAMESPACE:STRING=hdf5:: Example command line on Windows in c:\MyHDFstuff\hdf5ex\build directory: - cmake -G "Visual Studio 17 2022" -DH5EX_BUILD_TESTING:BOOL=ON -DBUILD_SHARED_LIBS:BOOL=ON .. + cmake -G "Visual Studio 17 2022" -DH5EXAMPLE_BUILD_TESTING:BOOL=ON -DBUILD_SHARED_LIBS:BOOL=ON .. C. Build HDF5 examples @@ -233,7 +233,7 @@ II. Building HDF5 Examples with CMake export HDF5_HOME=/HDF_Group/HDF5/2.0.0 cd /HDF5Examples/ - sh ./test-pc.sh /HDF5Examples/ /H5EX_BUILD/ . + sh ./test-pc.sh /HDF5Examples/ /H5EXAMPLE_BUILD/ . 5. The files that support building with CMake are all of the files in the config/cmake folder, the CMakeLists.txt files in each source folder, and @@ -255,12 +255,12 @@ III. Defaults in the CMakePresets.json file #### "BUILD_SHARED_LIBS": "ON", #### "USE_SHARED_LIBS": "ON" #### "CMAKE_BUILD_TYPE": "RelWithDebInfo" -#### "H5EX_BUILD_FORTRAN": "ON" -#### "H5EX_BUILD_CXX": "ON" -#### "H5EX_BUILD_JAVA": "ON" +#### "H5EXAMPLE_BUILD_FORTRAN": "ON" +#### "H5EXAMPLE_BUILD_CXX": "ON" +#### "H5EXAMPLE_BUILD_JAVA": "ON" #### "HDF5_NAMESPACE": {"type": "STRING", "value": "hdf5::"}, #### "HDF5_PACKAGE_NAME": {"type": "STRING", "value": "hdf5"}, -#### "H5EX_BUILD_TESTING": "ON" +#### "H5EXAMPLE_BUILD_TESTING": "ON" ======================================================================== @@ -269,14 +269,14 @@ IV. Defaults in the HDF5_Examples_options.cmake file #### DEFAULT: #### BUILD_SHARED_LIBS:BOOL=OFF -#### H5EX_BUILD_C:BOOL=ON -#### H5EX_BUILD_HL:BOOL=OFF -#### H5EX_BUILD_CXX:BOOL=OFF -#### H5EX_BUILD_FORTRAN:BOOL=OFF -#### H5EX_BUILD_JAVA:BOOL=OFF -#### H5EX_BUILD_FILTERS:BOOL=OFF -#### H5EX_BUILD_TESTING:BOOL=OFF -#### H5EX_ENABLE_PARALLEL:BOOL=OFF +#### H5EXAMPLE_BUILD_C:BOOL=ON +#### H5EXAMPLE_BUILD_HL:BOOL=OFF +#### H5EXAMPLE_BUILD_CXX:BOOL=OFF +#### H5EXAMPLE_BUILD_FORTRAN:BOOL=OFF +#### H5EXAMPLE_BUILD_JAVA:BOOL=OFF +#### H5EXAMPLE_BUILD_FILTERS:BOOL=OFF +#### H5EXAMPLE_BUILD_TESTING:BOOL=OFF +#### H5EXAMPLE_ENABLE_PARALLEL:BOOL=OFF ************************************************************************ diff --git a/HDF5Examples/config/HDFMacros.cmake b/HDF5Examples/config/HDFMacros.cmake index 77635babfda..69825c3dea5 100644 --- a/HDF5Examples/config/HDFMacros.cmake +++ b/HDF5Examples/config/HDFMacros.cmake @@ -90,8 +90,8 @@ macro (HDFTEST_COPY_FILE src dest target) endmacro () macro (HDF_DIR_PATHS package_prefix) - option (H5EX_USE_GNU_DIRS "ON to use GNU Coding Standard install directory variables, OFF to use historical settings" OFF) - if (H5EX_USE_GNU_DIRS) + option (H5EXAMPLE_USE_GNU_DIRS "ON to use GNU Coding Standard install directory variables, OFF to use historical settings" OFF) + if (H5EXAMPLE_USE_GNU_DIRS) include(GNUInstallDirs) if (NOT ${package_prefix}_INSTALL_BIN_DIR) set (${package_prefix}_INSTALL_BIN_DIR ${CMAKE_INSTALL_BINDIR}) diff --git a/HDF5Examples/config/cmake-presets/hidden-presets.json b/HDF5Examples/config/cmake-presets/hidden-presets.json index b8523977923..b96c7b4d5f0 100644 --- a/HDF5Examples/config/cmake-presets/hidden-presets.json +++ b/HDF5Examples/config/cmake-presets/hidden-presets.json @@ -112,14 +112,14 @@ "name": "ci-HL", "hidden": true, "cacheVariables": { - "H5EX_BUILD_HL": "ON" + "H5EXAMPLE_BUILD_HL": "ON" } }, { "name": "ci-Fortran", "hidden": true, "cacheVariables": { - "H5EX_BUILD_FORTRAN": "ON" + "H5EXAMPLE_BUILD_FORTRAN": "ON" } }, { @@ -139,14 +139,14 @@ "name": "ci-CPP", "hidden": true, "cacheVariables": { - "H5EX_BUILD_CXX": "ON" + "H5EXAMPLE_BUILD_CXX": "ON" } }, { "name": "ci-Java", "hidden": true, "cacheVariables": { - "H5EX_BUILD_JAVA": "ON" + "H5EXAMPLE_BUILD_JAVA": "ON" } }, { diff --git a/HDF5Examples/config/cmake/HDFExampleMacros.cmake b/HDF5Examples/config/cmake/HDFExampleMacros.cmake index c2f9187f520..6db35468936 100644 --- a/HDF5Examples/config/cmake/HDFExampleMacros.cmake +++ b/HDF5Examples/config/cmake/HDFExampleMacros.cmake @@ -34,7 +34,7 @@ macro (BASIC_SETTINGS varname) set (CMAKE_C_STANDARD 99) set (CMAKE_C_STANDARD_REQUIRED TRUE) - if (H5EX_BUILD_CXX) + if (H5EXAMPLE_BUILD_CXX) ENABLE_LANGUAGE (CXX) set (CMAKE_CXX_STANDARD 98) @@ -66,12 +66,12 @@ macro (BASIC_SETTINGS varname) #----------------------------------------------------------------------------- # Option to allow the user to disable compiler warnings #----------------------------------------------------------------------------- - option (H5EX_DISABLE_COMPILER_WARNINGS "Disable compiler warnings" OFF) - if (H5EX_DISABLE_COMPILER_WARNINGS) + option (H5EXAMPLE_DISABLE_COMPILER_WARNINGS "Disable compiler warnings" OFF) + if (H5EXAMPLE_DISABLE_COMPILER_WARNINGS) # MSVC uses /w to suppress warnings. It also complains if another # warning level is given, so remove it. if (MSVC) - set (H5EX_WARNINGS_BLOCKED 1) + set (H5EXAMPLE_WARNINGS_BLOCKED 1) string (REGEX REPLACE "(^| )([/-])W[0-9]( |$)" " " CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /w") if (CMAKE_CXX_COMPILER_LOADED AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU") @@ -84,12 +84,12 @@ macro (BASIC_SETTINGS varname) endif () # Borland uses -w- to suppress warnings. if (BORLAND) - set (H5EX_WARNINGS_BLOCKED 1) + set (H5EXAMPLE_WARNINGS_BLOCKED 1) set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w-") endif () # Most compilers use -w to suppress warnings. - if (NOT H5EX_WARNINGS_BLOCKED) + if (NOT H5EXAMPLE_WARNINGS_BLOCKED) set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w") if (CMAKE_CXX_COMPILER_LOADED AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU") set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w") @@ -106,8 +106,8 @@ macro (BASIC_SETTINGS varname) endmacro () macro (PYTHON_SUPPORT) - option (H5EX_BUILD_PYTHON "Test Python3 support" OFF) - if (H5EX_BUILD_PYTHON) + option (H5EXAMPLE_BUILD_PYTHON "Test Python3 support" OFF) + if (H5EXAMPLE_BUILD_PYTHON) find_package (Python3 COMPONENTS Interpreter Development NumPy) if (Python3_FOUND AND Python3_NumPy_FOUND) include (ExternalProject) @@ -122,40 +122,40 @@ macro (PYTHON_SUPPORT) INSTALL_COMMAND python3 -m pip --no-cache-dir install -v . ) else () - set (H5EX_BUILD_PYTHON OFF CACHE BOOL "Test Python3 support" FORCE) + set (H5EXAMPLE_BUILD_PYTHON OFF CACHE BOOL "Test Python3 support" FORCE) message (STATUS "Python3:${Python3_FOUND} or numpy:${Python3_NumPy_FOUND} not found - disable test of Python examples") endif () endif () endmacro () macro (HDF5_SUPPORT) - set (CMAKE_MODULE_PATH ${H5EX_CONFIG_DIR} ${H5EX_RESOURCES_DIR} ${CMAKE_MODULE_PATH}) + set (CMAKE_MODULE_PATH ${H5EXAMPLE_CONFIG_DIR} ${H5EXAMPLE_RESOURCES_DIR} ${CMAKE_MODULE_PATH}) option (USE_SHARED_LIBS "Use Shared Libraries" ON) - if (NOT H5EX_HDF5_HEADER) + if (NOT H5EXAMPLE_HDF5_HEADER) if (USE_SHARED_LIBS) set (FIND_HDF_COMPONENTS C shared) else () set (FIND_HDF_COMPONENTS C static) - set (H5EX_BUILD_JAVA OFF CACHE BOOL "Build Java support" FORCE) + set (H5EXAMPLE_BUILD_JAVA OFF CACHE BOOL "Build Java support" FORCE) message (STATUS "Using static HDF5 - disable build of Java examples") endif () - if (H5EX_BUILD_HL) + if (H5EXAMPLE_BUILD_HL) set (FIND_HDF_COMPONENTS ${FIND_HDF_COMPONENTS} HL) endif () - if (H5EX_BUILD_FORTRAN) + if (H5EXAMPLE_BUILD_FORTRAN) set (FIND_HDF_COMPONENTS ${FIND_HDF_COMPONENTS} Fortran) - if (H5EX_BUILD_HL) + if (H5EXAMPLE_BUILD_HL) set (FIND_HDF_COMPONENTS ${FIND_HDF_COMPONENTS} Fortran_HL) endif () endif () - if (H5EX_BUILD_CXX) + if (H5EXAMPLE_BUILD_CXX) set (FIND_HDF_COMPONENTS ${FIND_HDF_COMPONENTS} CXX) - if (H5EX_BUILD_HL) + if (H5EXAMPLE_BUILD_HL) set (FIND_HDF_COMPONENTS ${FIND_HDF_COMPONENTS} CXX_HL) endif () endif () - if (H5EX_BUILD_JAVA) + if (H5EXAMPLE_BUILD_JAVA) set (FIND_HDF_COMPONENTS ${FIND_HDF_COMPONENTS} Java) set (HDF5_Java_FOUND 1) #default setting for 1.10.1 and earlier endif () @@ -173,21 +173,21 @@ macro (HDF5_SUPPORT) if (NOT HDF5_static_C_FOUND AND NOT HDF5_shared_C_FOUND) #find library from non-dual-binary package set (FIND_HDF_COMPONENTS C) - if (H5EX_BUILD_HL) + if (H5EXAMPLE_BUILD_HL) set (FIND_HDF_COMPONENTS ${FIND_HDF_COMPONENTS} HL) endif () - if (H5EX_BUILD_FORTRAN) + if (H5EXAMPLE_BUILD_FORTRAN) set (FIND_HDF_COMPONENTS ${FIND_HDF_COMPONENTS} Fortran) - if (H5EX_BUILD_HL) + if (H5EXAMPLE_BUILD_HL) set (FIND_HDF_COMPONENTS ${FIND_HDF_COMPONENTS} Fortran_HL) endif () endif () - if (H5EX_BUILD_JAVA) + if (H5EXAMPLE_BUILD_JAVA) set (FIND_HDF_COMPONENTS ${FIND_HDF_COMPONENTS} Java) endif () - if (H5EX_BUILD_CXX) + if (H5EXAMPLE_BUILD_CXX) set (FIND_HDF_COMPONENTS ${FIND_HDF_COMPONENTS} CXX) - if (H5EX_BUILD_HL) + if (H5EXAMPLE_BUILD_HL) set (FIND_HDF_COMPONENTS ${FIND_HDF_COMPONENTS} CXX_HL) endif () endif () @@ -198,7 +198,7 @@ macro (HDF5_SUPPORT) EXTERNAL_HDF5_STATUS () endif () message (STATUS "HDF5 libs:${HDF5_FOUND} C:${HDF5_C_FOUND} Fortran:${HDF5_Fortran_FOUND} Java:${HDF5_Java_FOUND}") - set (H5EX_HDF5_LINK_LIBS ${H5EX_HDF5_LINK_LIBS} ${HDF5_LIBRARIES}) + set (H5EXAMPLE_HDF5_LINK_LIBS ${H5EXAMPLE_HDF5_LINK_LIBS} ${HDF5_LIBRARIES}) if (HDF5_PROVIDES_SHARED_LIBS) add_definitions (-DH5_BUILT_AS_DYNAMIC_LIB) else () @@ -209,11 +209,11 @@ macro (HDF5_SUPPORT) else () set_property (TARGET ${HDF5_NAMESPACE}h5dump PROPERTY IMPORTED_LOCATION "${HDF5_TOOLS_DIR}/h5dump") endif () - if (H5EX_BUILD_JAVA) + if (H5EXAMPLE_BUILD_JAVA) set (CMAKE_JAVA_INCLUDE_PATH "${CMAKE_JAVA_INCLUDE_PATH};${HDF5_JAVA_INCLUDE_DIRS}") message (STATUS "HDF5 jars:${HDF5_JAVA_INCLUDE_DIRS}") endif () - set (H5EX_HDF5_DUMP_EXECUTABLE $) + set (H5EXAMPLE_HDF5_DUMP_EXECUTABLE $) else () if (HDF5_BUILD_MODE) string (TOUPPER "_${HDF5_BUILD_MODE}" UPPER_BUILD_TYPE) @@ -225,98 +225,98 @@ macro (HDF5_SUPPORT) get_filename_component (_LIBRARY_PATH ${HDF5_INCLUDE_DIR} DIRECTORY) set (HDF5_LIBRARY_PATH "${_LIBRARY_PATH}/lib") if (USE_SHARED_LIBS AND HDF5_shared_C_FOUND) - set (H5EX_HDF5_LINK_LIBS ${H5EX_HDF5_LINK_LIBS} ${HDF5_C_SHARED_LIBRARY}) + set (H5EXAMPLE_HDF5_LINK_LIBS ${H5EXAMPLE_HDF5_LINK_LIBS} ${HDF5_C_SHARED_LIBRARY}) else () - set (H5EX_HDF5_LINK_LIBS ${H5EX_HDF5_LINK_LIBS} ${HDF5_C_STATIC_LIBRARY}) + set (H5EXAMPLE_HDF5_LINK_LIBS ${H5EXAMPLE_HDF5_LINK_LIBS} ${HDF5_C_STATIC_LIBRARY}) endif () if (HDF5_VERSION VERSION_LESS "1.14.4" AND NOT HDF5_shared_C_FOUND) if (NOT TARGET ${HDF5_NAMESPACE}h5dump-shared) add_executable (${HDF5_NAMESPACE}h5dump-shared IMPORTED) endif () - set (H5EX_HDF5_DUMP_EXECUTABLE $) + set (H5EXAMPLE_HDF5_DUMP_EXECUTABLE $) else () if (NOT TARGET ${HDF5_NAMESPACE}h5dump) add_executable (${HDF5_NAMESPACE}h5dump IMPORTED) endif() - set (H5EX_HDF5_DUMP_EXECUTABLE $) + set (H5EXAMPLE_HDF5_DUMP_EXECUTABLE $) endif() if (NOT HDF5_static_HL_FOUND AND NOT HDF5_shared_HL_FOUND) - set (H5EX_BUILD_HL OFF CACHE BOOL "Build High Level support" FORCE) + set (H5EXAMPLE_BUILD_HL OFF CACHE BOOL "Build High Level support" FORCE) message (STATUS "HDF5 HL libs not found - disable build of HL examples") else () - if (H5EX_BUILD_HL AND ${HDF5_PROVIDES_HL_LIB}) + if (H5EXAMPLE_BUILD_HL AND ${HDF5_PROVIDES_HL_LIB}) if (BUILD_SHARED_LIBS AND HDF5_shared_HL_FOUND) - set (H5EX_HDF5_LINK_LIBS ${H5EX_HDF5_LINK_LIBS} ${HDF5_HL_SHARED_LIBRARY}) + set (H5EXAMPLE_HDF5_LINK_LIBS ${H5EXAMPLE_HDF5_LINK_LIBS} ${HDF5_HL_SHARED_LIBRARY}) elseif (HDF5_static_HL_FOUND) - set (H5EX_HDF5_LINK_LIBS ${H5EX_HDF5_LINK_LIBS} ${HDF5_HL_STATIC_LIBRARY}) + set (H5EXAMPLE_HDF5_LINK_LIBS ${H5EXAMPLE_HDF5_LINK_LIBS} ${HDF5_HL_STATIC_LIBRARY}) else () - set (H5EX_BUILD_HL OFF CACHE BOOL "Build High Level support" FORCE) + set (H5EXAMPLE_BUILD_HL OFF CACHE BOOL "Build High Level support" FORCE) message (STATUS "HDF5 HL libs not found - disable build of HL examples") endif () endif () endif () if (NOT HDF5_static_Fortran_FOUND AND NOT HDF5_shared_Fortran_FOUND) - set (H5EX_BUILD_FORTRAN OFF CACHE BOOL "Build FORTRAN support" FORCE) + set (H5EXAMPLE_BUILD_FORTRAN OFF CACHE BOOL "Build FORTRAN support" FORCE) message (STATUS "HDF5 Fortran libs not found - disable build of Fortran examples") else () - if (H5EX_BUILD_FORTRAN AND ${HDF5_PROVIDES_FORTRAN}) + if (H5EXAMPLE_BUILD_FORTRAN AND ${HDF5_PROVIDES_FORTRAN}) if (BUILD_SHARED_LIBS AND HDF5_shared_Fortran_FOUND) - set (H5EX_HDF5_LINK_LIBS ${H5EX_HDF5_LINK_LIBS} ${HDF5_FORTRAN_SHARED_LIBRARY}) - if (H5EX_BUILD_HL AND ${HDF5_PROVIDES_HL_LIB}) - set (H5EX_HDF5_LINK_LIBS ${H5EX_HDF5_LINK_LIBS} ${HDF5_FORTRAN_HL_SHARED_LIBRARY}) + set (H5EXAMPLE_HDF5_LINK_LIBS ${H5EXAMPLE_HDF5_LINK_LIBS} ${HDF5_FORTRAN_SHARED_LIBRARY}) + if (H5EXAMPLE_BUILD_HL AND ${HDF5_PROVIDES_HL_LIB}) + set (H5EXAMPLE_HDF5_LINK_LIBS ${H5EXAMPLE_HDF5_LINK_LIBS} ${HDF5_FORTRAN_HL_SHARED_LIBRARY}) endif () elseif (HDF5_static_Fortran_FOUND) - set (H5EX_HDF5_LINK_LIBS ${H5EX_HDF5_LINK_LIBS} ${HDF5_FORTRAN_STATIC_LIBRARY}) - if (H5EX_BUILD_HL AND ${HDF5_PROVIDES_HL_LIB}) - set (H5EX_HDF5_LINK_LIBS ${H5EX_HDF5_LINK_LIBS} ${HDF5_FORTRAN_HL_STATIC_LIBRARY}) + set (H5EXAMPLE_HDF5_LINK_LIBS ${H5EXAMPLE_HDF5_LINK_LIBS} ${HDF5_FORTRAN_STATIC_LIBRARY}) + if (H5EXAMPLE_BUILD_HL AND ${HDF5_PROVIDES_HL_LIB}) + set (H5EXAMPLE_HDF5_LINK_LIBS ${H5EXAMPLE_HDF5_LINK_LIBS} ${HDF5_FORTRAN_HL_STATIC_LIBRARY}) endif () else () - set (H5EX_BUILD_FORTRAN OFF CACHE BOOL "Build FORTRAN support" FORCE) + set (H5EXAMPLE_BUILD_FORTRAN OFF CACHE BOOL "Build FORTRAN support" FORCE) message (STATUS "HDF5 Fortran libs not found - disable build of Fortran examples") endif () endif () endif () if (NOT HDF5_static_CXX_FOUND AND NOT HDF5_shared_CXX_FOUND) - set (H5EX_BUILD_CXX OFF CACHE BOOL "Build CXX support" FORCE) + set (H5EXAMPLE_BUILD_CXX OFF CACHE BOOL "Build CXX support" FORCE) message (STATUS "HDF5 CXX libs not found - disable build of CXX examples") else () - if (H5EX_BUILD_CXX AND ${HDF5_PROVIDES_CPP_LIB}) + if (H5EXAMPLE_BUILD_CXX AND ${HDF5_PROVIDES_CPP_LIB}) if (BUILD_SHARED_LIBS AND HDF5_shared_CXX_FOUND) - set (H5EX_HDF5_LINK_LIBS ${H5EX_HDF5_LINK_LIBS} ${HDF5_CXX_SHARED_LIBRARY}) - if (H5EX_BUILD_HL AND ${HDF5_PROVIDES_HL_LIB}) - set (H5EX_HDF5_LINK_LIBS ${H5EX_HDF5_LINK_LIBS} ${HDF5_CXX_HL_SHARED_LIBRARY}) + set (H5EXAMPLE_HDF5_LINK_LIBS ${H5EXAMPLE_HDF5_LINK_LIBS} ${HDF5_CXX_SHARED_LIBRARY}) + if (H5EXAMPLE_BUILD_HL AND ${HDF5_PROVIDES_HL_LIB}) + set (H5EXAMPLE_HDF5_LINK_LIBS ${H5EXAMPLE_HDF5_LINK_LIBS} ${HDF5_CXX_HL_SHARED_LIBRARY}) endif () elseif (HDF5_static_CXX_FOUND) - set (H5EX_HDF5_LINK_LIBS ${H5EX_HDF5_LINK_LIBS} ${HDF5_CXX_STATIC_LIBRARY}) - if (H5EX_BUILD_HL AND ${HDF5_PROVIDES_HL_LIB}) - set (H5EX_HDF5_LINK_LIBS ${H5EX_HDF5_LINK_LIBS} ${HDF5_CXX_HL_STATIC_LIBRARY}) + set (H5EXAMPLE_HDF5_LINK_LIBS ${H5EXAMPLE_HDF5_LINK_LIBS} ${HDF5_CXX_STATIC_LIBRARY}) + if (H5EXAMPLE_BUILD_HL AND ${HDF5_PROVIDES_HL_LIB}) + set (H5EXAMPLE_HDF5_LINK_LIBS ${H5EXAMPLE_HDF5_LINK_LIBS} ${HDF5_CXX_HL_STATIC_LIBRARY}) endif () else () - set (H5EX_BUILD_CXX OFF CACHE BOOL "Build CXX support" FORCE) + set (H5EXAMPLE_BUILD_CXX OFF CACHE BOOL "Build CXX support" FORCE) message (STATUS "HDF5 CXX libs not found - disable build of CXX examples") endif () endif () endif () - if (H5EX_BUILD_JAVA AND HDF5_Java_FOUND) + if (H5EXAMPLE_BUILD_JAVA AND HDF5_Java_FOUND) if (${HDF5_PROVIDES_JAVA}) set (CMAKE_JAVA_INCLUDE_PATH "${CMAKE_JAVA_INCLUDE_PATH};${HDF5_JAVA_INCLUDE_DIRS}") get_target_property (libsoname ${HDF5_JAVA_LIBRARY} IMPORTED_SONAME${UPPER_BUILD_TYPE}) get_filename_component (libname ${libsoname} NAME_WE) string (REGEX REPLACE "^lib" "" libname ${libname}) message (STATUS "HDF5 lib:${HDF5_JAVA_LIBRARY} OR ${libsoname} OR ${libname}") - set (H5EX_JAVA_LIBRARY ${libname}) - set (H5EX_JAVA_LIBRARIES ${HDF5_JAVA_LIBRARY}) - message (STATUS "HDF5 lib:${H5EX_JAVA_LIBRARY} jars:${HDF5_JAVA_INCLUDE_DIRS}}") + set (H5EXAMPLE_JAVA_LIBRARY ${libname}) + set (H5EXAMPLE_JAVA_LIBRARIES ${HDF5_JAVA_LIBRARY}) + message (STATUS "HDF5 lib:${H5EXAMPLE_JAVA_LIBRARY} jars:${HDF5_JAVA_INCLUDE_DIRS}}") else () - set (H5EX_BUILD_JAVA OFF CACHE BOOL "Build Java support" FORCE) + set (H5EXAMPLE_BUILD_JAVA OFF CACHE BOOL "Build Java support" FORCE) message (STATUS "HDF5 Java libs not found - disable build of Java examples") endif () else () - set (H5EX_BUILD_JAVA OFF CACHE BOOL "Build Java support" FORCE) + set (H5EXAMPLE_BUILD_JAVA OFF CACHE BOOL "Build Java support" FORCE) endif () endif () else () @@ -332,33 +332,33 @@ macro (HDF5_SUPPORT) else () set (HDF5_PROVIDES_SHARED_LIBS 0) endif () - set (H5EX_HDF5_LINK_LIBS ${H5EX_HDF5_LINK_LIBS} ${HDF5_LIBRARIES}) + set (H5EXAMPLE_HDF5_LINK_LIBS ${H5EXAMPLE_HDF5_LINK_LIBS} ${HDF5_LIBRARIES}) add_executable (${HDF5_NAMESPACE}h5dump IMPORTED) set_property (TARGET ${HDF5_NAMESPACE}h5dump PROPERTY IMPORTED_LOCATION "${HDF5_TOOLS_DIR}/h5dump") - set (H5EX_HDF5_DUMP_EXECUTABLE $) + set (H5EXAMPLE_HDF5_DUMP_EXECUTABLE $) endif () set (HDF5_PACKAGE_NAME ${SEARCH_PACKAGE_NAME}) if (HDF5_FOUND) - set (H5EX_HDF5_INCLUDE_DIRS ${HDF5_INCLUDE_DIR}) - set (H5EX_HDF5_HAVE_H5PUBCONF_H 1) - set (H5EX_HDF5_HAVE_HDF5 1) - set (H5EX_HDF5_HEADER "h5pubconf.h") + set (H5EXAMPLE_HDF5_INCLUDE_DIRS ${HDF5_INCLUDE_DIR}) + set (H5EXAMPLE_HDF5_HAVE_H5PUBCONF_H 1) + set (H5EXAMPLE_HDF5_HAVE_HDF5 1) + set (H5EXAMPLE_HDF5_HEADER "h5pubconf.h") message (STATUS "HDF5-${HDF5_VERSION_STRING} found: INC=${HDF5_INCLUDE_DIR} TOOLS=${HDF5_TOOLS_DIR}") else () message (FATAL_ERROR " HDF5 is Required for HDF5 Examples") endif () else () # This project is being called from within another and HDF5 is already configured - set (H5EX_HDF5_HAVE_H5PUBCONF_H 1) - set (H5EX_HDF5_HAVE_HDF5 1) + set (H5EXAMPLE_HDF5_HAVE_H5PUBCONF_H 1) + set (H5EXAMPLE_HDF5_HAVE_HDF5 1) message (STATUS "HDF5-${HDF5_VERSION_STRING} used") endif () - if (H5EX_BUILD_FORTRAN) - list (APPEND H5EX_HDF5_INCLUDE_DIRS ${HDF5_INCLUDE_DIR_FORTRAN}) + if (H5EXAMPLE_BUILD_FORTRAN) + list (APPEND H5EXAMPLE_HDF5_INCLUDE_DIRS ${HDF5_INCLUDE_DIR_FORTRAN}) endif () - message (STATUS "HDF5 link libs: ${H5EX_HDF5_LINK_LIBS} Includes: ${H5EX_HDF5_INCLUDE_DIRS}") + message (STATUS "HDF5 link libs: ${H5EXAMPLE_HDF5_LINK_LIBS} Includes: ${H5EXAMPLE_HDF5_INCLUDE_DIRS}") endmacro () #------------------------------------------------------------------------------- diff --git a/HDF5Examples/config/cmake/cacheinit.cmake b/HDF5Examples/config/cmake/cacheinit.cmake index 872462d54b0..5a554bc5222 100644 --- a/HDF5Examples/config/cmake/cacheinit.cmake +++ b/HDF5Examples/config/cmake/cacheinit.cmake @@ -6,21 +6,21 @@ set (BUILD_SHARED_LIBS ON CACHE BOOL "Build Shared Libraries" FORCE) -set (H5EX_BUILD_TESTING ON CACHE BOOL "Build HDF5 Unit Testing" FORCE) +set (H5EXAMPLE_BUILD_TESTING ON CACHE BOOL "Build HDF5 Unit Testing" FORCE) -#set (H5EX_ENABLE_PARALLEL ON CACHE BOOL "Enable parallel build (requires MPI)" FORCE) +#set (H5EXAMPLE_ENABLE_PARALLEL ON CACHE BOOL "Enable parallel build (requires MPI)" FORCE) -#set (H5EX_BUILD_HL ON CACHE BOOL "Build High Level support" FORCE) +#set (H5EXAMPLE_BUILD_HL ON CACHE BOOL "Build High Level support" FORCE) -#set (H5EX_BUILD_FORTRAN ON CACHE BOOL "Build FORTRAN support" FORCE) +#set (H5EXAMPLE_BUILD_FORTRAN ON CACHE BOOL "Build FORTRAN support" FORCE) -#set (H5EX_BUILD_CXX ON CACHE BOOL "Build C++ support" FORCE) +#set (H5EXAMPLE_BUILD_CXX ON CACHE BOOL "Build C++ support" FORCE) -#set (H5EX_BUILD_FILTERS ON CACHE BOOL "Build filter support" FORCE) +#set (H5EXAMPLE_BUILD_FILTERS ON CACHE BOOL "Build filter support" FORCE) -#set (H5EX_ENABLE_F2003 ON CACHE BOOL "Enable FORTRAN 2003 Standard" FORCE) +#set (H5EXAMPLE_ENABLE_F2003 ON CACHE BOOL "Enable FORTRAN 2003 Standard" FORCE) -#set (H5EX_BUILD_JAVA ON CACHE BOOL "Build JAVA support" FORCE) +#set (H5EXAMPLE_BUILD_JAVA ON CACHE BOOL "Build JAVA support" FORCE) set (HDF5_PACKAGE_NAME "hdf5" CACHE STRING "Name of HDF5 package" FORCE) diff --git a/config/cmake/HDF5ExampleCache.cmake b/config/cmake/HDF5ExampleCache.cmake index fc9ba499aed..5786c9589cf 100644 --- a/config/cmake/HDF5ExampleCache.cmake +++ b/config/cmake/HDF5ExampleCache.cmake @@ -5,16 +5,15 @@ ######################### # Set example options to match main HDF5 build options -set (H5EX_BUILD_TESTING ${BUILD_TESTING} CACHE BOOL "Enable examples testing" FORCE) -set (H5EX_BUILD_EXAMPLES ${HDF5_BUILD_EXAMPLES} CACHE BOOL "Build Examples" FORCE) -set (H5EX_BUILD_FORTRAN ${HDF5_BUILD_FORTRAN} CACHE BOOL "Build examples FORTRAN support" FORCE) -set (H5EX_BUILD_JAVA ${HDF5_BUILD_JAVA} CACHE BOOL "Build examples JAVA support" FORCE) -set (H5EX_BUILD_FILTERS ${HDF5_ENABLE_PLUGIN_SUPPORT} CACHE BOOL "Build examples PLUGIN filter support" FORCE) -set (H5EX_BUILD_CXX ${HDF5_BUILD_CPP_LIB} CACHE BOOL "Build HDF5 C++ Library" FORCE) -set (H5EX_BUILD_HL ${HDF5_BUILD_HL_LIB} CACHE BOOL "Build High Level examples" FORCE) -set (H5EX_ENABLE_THREADSAFE ${HDF5_ENABLE_THREADSAFE} CACHE BOOL "Enable examples thread-safety" FORCE) -set (H5EX_ENABLE_PARALLEL ${HDF5_ENABLE_PARALLEL} CACHE BOOL "Enable examples parallel build (requires MPI)" FORCE) -set (H5EX_USE_GNU_DIRS ${HDF5_USE_GNU_DIRS} CACHE BOOL "ON to use GNU Coding Standard install directory variables, OFF to use historical settings" FORCE) +set (H5EXAMPLE_BUILD_TESTING ${BUILD_TESTING} CACHE BOOL "Enable examples testing" FORCE) +set (H5EXAMPLE_BUILD_FORTRAN ${HDF5_BUILD_FORTRAN} CACHE BOOL "Build examples FORTRAN support" FORCE) +set (H5EXAMPLE_BUILD_JAVA ${HDF5_BUILD_JAVA} CACHE BOOL "Build examples JAVA support" FORCE) +set (H5EXAMPLE_BUILD_FILTERS ${HDF5_ENABLE_PLUGIN_SUPPORT} CACHE BOOL "Build examples PLUGIN filter support" FORCE) +set (H5EXAMPLE_BUILD_CXX ${HDF5_BUILD_CPP_LIB} CACHE BOOL "Build HDF5 C++ Library" FORCE) +set (H5EXAMPLE_BUILD_HL ${HDF5_BUILD_HL_LIB} CACHE BOOL "Build High Level examples" FORCE) +set (H5EXAMPLE_ENABLE_THREADSAFE ${HDF5_ENABLE_THREADSAFE} CACHE BOOL "Enable examples thread-safety" FORCE) +set (H5EXAMPLE_ENABLE_PARALLEL ${HDF5_ENABLE_PARALLEL} CACHE BOOL "Enable examples parallel build (requires MPI)" FORCE) +set (H5EXAMPLE_USE_GNU_DIRS ${HDF5_USE_GNU_DIRS} CACHE BOOL "ON to use GNU Coding Standard install directory variables, OFF to use historical settings" FORCE) # set PROVIDES variables for all variables that are used in conditions in HDF5Examples. set (HDF5_PROVIDES_FORTRAN ${HDF5_BUILD_FORTRAN} CACHE BOOL "Provides Fortran" FORCE) mark_as_advanced (HDF5_PROVIDES_FORTRAN) @@ -36,17 +35,17 @@ set (HDF5_PROVIDES_SUBFILING_VFD ${HDF5_ENABLE_SUBFILING_VFD} CACHE BOOL "Provid mark_as_advanced (HDF5_PROVIDES_SUBFILING_VFD) # Preset HDF5 cache vars to this project's libraries instead of searching -set (H5EX_HDF5_HEADER "H5pubconf.h" CACHE STRING "Name of HDF5 header" FORCE) -# set (H5EX_HDF5_INCLUDE_DIRS $ CACHE PATH "HDF5 include dirs" FORCE) -set (H5EX_HDF5_INCLUDE_DIRS "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR}" CACHE PATH "HDF5 include dirs" FORCE) -set (H5EX_HDF5_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE STRING "HDF5 build folder" FORCE) +set (H5EXAMPLE_HDF5_HEADER "H5pubconf.h" CACHE STRING "Name of HDF5 header" FORCE) +# set (H5EXAMPLE_HDF5_INCLUDE_DIRS $ CACHE PATH "HDF5 include dirs" FORCE) +set (H5EXAMPLE_HDF5_INCLUDE_DIRS "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR}" CACHE PATH "HDF5 include dirs" FORCE) +set (H5EXAMPLE_HDF5_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE STRING "HDF5 build folder" FORCE) set (EXAMPLES_EXTERNALLY_CONFIGURED ON CACHE BOOL "Examples build is used in another project" FORCE) # Set up example-specific variables set (EXAMPLE_VARNAME "H5") -set (H5EX_CONFIG_DIR ${HDF_CONFIG_DIR}) -set (H5EX_RESOURCES_DIR ${HDF_RESOURCES_DIR}) -message (STATUS "HDF5 Example H5EX_RESOURCES_DIR: ${H5EX_RESOURCES_DIR}") +set (H5EXAMPLE_CONFIG_DIR ${HDF_CONFIG_DIR}) +set (H5EXAMPLE_RESOURCES_DIR ${HDF_RESOURCES_DIR}) +message (STATUS "HDF5 Example H5EXAMPLE_RESOURCES_DIR: ${H5EXAMPLE_RESOURCES_DIR}") # Set API version flags based on HDF5_DEFAULT_API_VERSION if (HDF5_DEFAULT_API_VERSION MATCHES "v16") @@ -68,68 +67,68 @@ message (STATUS "HDF5 H5_LIBVER_DIR: ${H5_LIBVER_DIR} HDF5_API_VERSION: ${HDF5_D if (NOT BUILD_SHARED_LIBS AND BUILD_STATIC_LIBS) # Static build configuration set (USE_SHARED_LIBS OFF CACHE BOOL "Use Shared Libraries for Examples" FORCE) - set (H5EX_HDF5_LINK_LIBS ${HDF5_LIB_TARGET} CACHE STRING "HDF5 target" FORCE) + set (H5EXAMPLE_HDF5_LINK_LIBS ${HDF5_LIB_TARGET} CACHE STRING "HDF5 target" FORCE) if (HDF5_BUILD_HL_LIB) - set (H5EX_HDF5_LINK_LIBS ${H5EX_HDF5_LINK_LIBS} ${HDF5_HL_LIB_TARGET}) - set (H5EX_HDF5_INCLUDE_DIRS "${H5EX_HDF5_INCLUDE_DIRS};${HDF5_HL_SRC_DIR};${HDF5_HL_SRC_BINARY_DIR}" CACHE PATH "HDF5 include dirs" FORCE) + set (H5EXAMPLE_HDF5_LINK_LIBS ${H5EXAMPLE_HDF5_LINK_LIBS} ${HDF5_HL_LIB_TARGET}) + set (H5EXAMPLE_HDF5_INCLUDE_DIRS "${H5EXAMPLE_HDF5_INCLUDE_DIRS};${HDF5_HL_SRC_DIR};${HDF5_HL_SRC_BINARY_DIR}" CACHE PATH "HDF5 include dirs" FORCE) endif () if (HDF5_BUILD_FORTRAN) - set (H5EX_HDF5_LINK_LIBS ${H5EX_HDF5_LINK_LIBS} ${HDF5_F90_LIB_TARGET}) - set (H5EX_MOD_EXT "/static" CACHE STRING "Use Static Modules for Examples" FORCE) + set (H5EXAMPLE_HDF5_LINK_LIBS ${H5EXAMPLE_HDF5_LINK_LIBS} ${HDF5_F90_LIB_TARGET}) + set (H5EXAMPLE_MOD_EXT "/static" CACHE STRING "Use Static Modules for Examples" FORCE) if (HDF5_BUILD_HL_LIB) - set (H5EX_HDF5_LINK_LIBS ${H5EX_HDF5_LINK_LIBS} ${HDF5_HL_F90_LIB_TARGET}) + set (H5EXAMPLE_HDF5_LINK_LIBS ${H5EXAMPLE_HDF5_LINK_LIBS} ${HDF5_HL_F90_LIB_TARGET}) endif () endif () if (HDF5_BUILD_CPP_LIB) - set (H5EX_HDF5_LINK_LIBS ${H5EX_HDF5_LINK_LIBS} ${HDF5_CPP_LIB_TARGET}) + set (H5EXAMPLE_HDF5_LINK_LIBS ${H5EXAMPLE_HDF5_LINK_LIBS} ${HDF5_CPP_LIB_TARGET}) if (HDF5_BUILD_HL_LIB) - set (H5EX_HDF5_LINK_LIBS ${H5EX_HDF5_LINK_LIBS} ${HDF5_HL_CPP_LIB_TARGET}) - set (H5EX_HDF5_INCLUDE_DIRS "${H5EX_HDF5_INCLUDE_DIRS};${HDF5_HL_CPP_SRC_DIR};${HDF5_HL_CPP_SRC_BINARY_DIR}" CACHE PATH "HDF5 include dirs" FORCE) + set (H5EXAMPLE_HDF5_LINK_LIBS ${H5EXAMPLE_HDF5_LINK_LIBS} ${HDF5_HL_CPP_LIB_TARGET}) + set (H5EXAMPLE_HDF5_INCLUDE_DIRS "${H5EXAMPLE_HDF5_INCLUDE_DIRS};${HDF5_HL_CPP_SRC_DIR};${HDF5_HL_CPP_SRC_BINARY_DIR}" CACHE PATH "HDF5 include dirs" FORCE) endif () endif () else () # Shared build configuration set (USE_SHARED_LIBS ON CACHE BOOL "Use Shared Libraries for Examples" FORCE) - set (H5EX_HDF5_LINK_LIBS ${HDF5_LIBSH_TARGET} CACHE STRING "HDF5 target" FORCE) + set (H5EXAMPLE_HDF5_LINK_LIBS ${HDF5_LIBSH_TARGET} CACHE STRING "HDF5 target" FORCE) if (HDF5_BUILD_HL_LIB) - set (H5EX_HDF5_LINK_LIBS ${H5EX_HDF5_LINK_LIBS} ${HDF5_HL_LIBSH_TARGET}) - set (H5EX_HDF5_INCLUDE_DIRS "${H5EX_HDF5_INCLUDE_DIRS};${HDF5_HL_SRC_DIR};${HDF5_HL_SRC_BINARY_DIR}" CACHE PATH "HDF5 include dirs" FORCE) + set (H5EXAMPLE_HDF5_LINK_LIBS ${H5EXAMPLE_HDF5_LINK_LIBS} ${HDF5_HL_LIBSH_TARGET}) + set (H5EXAMPLE_HDF5_INCLUDE_DIRS "${H5EXAMPLE_HDF5_INCLUDE_DIRS};${HDF5_HL_SRC_DIR};${HDF5_HL_SRC_BINARY_DIR}" CACHE PATH "HDF5 include dirs" FORCE) endif () if (HDF5_BUILD_CPP_LIB) - set (H5EX_HDF5_LINK_LIBS ${H5EX_HDF5_LINK_LIBS} ${HDF5_CPP_LIBSH_TARGET}) + set (H5EXAMPLE_HDF5_LINK_LIBS ${H5EXAMPLE_HDF5_LINK_LIBS} ${HDF5_CPP_LIBSH_TARGET}) endif () if (HDF5_BUILD_FORTRAN) - set (H5EX_HDF5_LINK_LIBS ${H5EX_HDF5_LINK_LIBS} ${HDF5_F90_LIBSH_TARGET}) - set (H5EX_MOD_EXT "/shared" CACHE STRING "Use Shared Modules for Examples" FORCE) + set (H5EXAMPLE_HDF5_LINK_LIBS ${H5EXAMPLE_HDF5_LINK_LIBS} ${HDF5_F90_LIBSH_TARGET}) + set (H5EXAMPLE_MOD_EXT "/shared" CACHE STRING "Use Shared Modules for Examples" FORCE) if (HDF5_BUILD_HL_LIB) - set (H5EX_HDF5_LINK_LIBS ${H5EX_HDF5_LINK_LIBS} ${HDF5_HL_F90_LIBSH_TARGET}) + set (H5EXAMPLE_HDF5_LINK_LIBS ${H5EXAMPLE_HDF5_LINK_LIBS} ${HDF5_HL_F90_LIBSH_TARGET}) endif () endif () if (HDF5_BUILD_CPP_LIB) - set (H5EX_HDF5_LINK_LIBS ${H5EX_HDF5_LINK_LIBS} ${HDF5_CPP_LIBSH_TARGET}) + set (H5EXAMPLE_HDF5_LINK_LIBS ${H5EXAMPLE_HDF5_LINK_LIBS} ${HDF5_CPP_LIBSH_TARGET}) if (HDF5_BUILD_HL_LIB) - set (H5EX_HDF5_LINK_LIBS ${H5EX_HDF5_LINK_LIBS} ${HDF5_HL_CPP_LIBSH_TARGET}) - set (H5EX_HDF5_INCLUDE_DIRS "${H5EX_HDF5_INCLUDE_DIRS};${HDF5_HL_CPP_SRC_DIR};${HDF5_HL_CPP_SRC_BINARY_DIR}" CACHE PATH "HDF5 include dirs" FORCE) + set (H5EXAMPLE_HDF5_LINK_LIBS ${H5EXAMPLE_HDF5_LINK_LIBS} ${HDF5_HL_CPP_LIBSH_TARGET}) + set (H5EXAMPLE_HDF5_INCLUDE_DIRS "${H5EXAMPLE_HDF5_INCLUDE_DIRS};${HDF5_HL_CPP_SRC_DIR};${HDF5_HL_CPP_SRC_BINARY_DIR}" CACHE PATH "HDF5 include dirs" FORCE) endif () endif () if (HDF5_BUILD_JAVA) # Set up Java library and include variables for examples set (HDF5_JAVA_INCLUDE_DIRS ${HDF5_JAVA_JARS} ${HDF5_JAVA_LOGGING_JAR}) - set (H5EX_JAVA_LIBRARY ${HDF5_JAVA_JNI_LIB_TARGET}) - set (H5EX_JAVA_LIBRARIES ${HDF5_JAVA_HDF5_LIB_TARGET} ${HDF5_JAVA_JNI_LIB_TARGET}) + set (H5EXAMPLE_JAVA_LIBRARY ${HDF5_JAVA_JNI_LIB_TARGET}) + set (H5EXAMPLE_JAVA_LIBRARIES ${HDF5_JAVA_HDF5_LIB_TARGET} ${HDF5_JAVA_JNI_LIB_TARGET}) set (HDF5_LIBRARY_PATH ${CMAKE_TEST_OUTPUT_DIRECTORY}) - message (STATUS "HDF5 Example java lib: ${H5EX_JAVA_LIBRARY} jars: ${HDF5_JAVA_INCLUDE_DIRS}") + message (STATUS "HDF5 Example java lib: ${H5EXAMPLE_JAVA_LIBRARY} jars: ${HDF5_JAVA_INCLUDE_DIRS}") endif () if (HDF5_ENABLE_PLUGIN_SUPPORT) - set (H5EX_HDF5_PLUGIN_PATH "${CMAKE_BINARY_DIR}/plugins") + set (H5EXAMPLE_HDF5_PLUGIN_PATH "${CMAKE_BINARY_DIR}/plugins") endif () endif () -message (STATUS "HDF5 Example link libs: ${H5EX_HDF5_LINK_LIBS} Includes: ${H5EX_HDF5_INCLUDE_DIRS}") +message (STATUS "HDF5 Example link libs: ${H5EXAMPLE_HDF5_LINK_LIBS} Includes: ${H5EXAMPLE_HDF5_INCLUDE_DIRS}") # Set up tool and executable variables for use in example tests set (HDF5_TOOLS_DIR ${CMAKE_TEST_OUTPUT_DIRECTORY} CACHE STRING "HDF5 Directory for all Executables" FORCE) -set (H5EX_HDF5_DUMP_EXECUTABLE $ CACHE STRING "HDF5 h5dump target" FORCE) -set (H5EX_HDF5_REPACK_EXECUTABLE $ CACHE STRING "HDF5 h5repack target" FORCE) -set (H5EX_WORDS_BIGENDIAN ${H5_WORDS_BIGENDIAN} CACHE BOOL "System is Big Endian" FORCE) +set (H5EXAMPLE_HDF5_DUMP_EXECUTABLE $ CACHE STRING "HDF5 h5dump target" FORCE) +set (H5EXAMPLE_HDF5_REPACK_EXECUTABLE $ CACHE STRING "HDF5 h5repack target" FORCE) +set (H5EXAMPLE_WORDS_BIGENDIAN ${H5_WORDS_BIGENDIAN} CACHE BOOL "System is Big Endian" FORCE) # End of HDF5ExampleCache.cmake diff --git a/config/examples/HDF5_Examples_options.cmake b/config/examples/HDF5_Examples_options.cmake index 1f18ae489af..a4049bd3902 100644 --- a/config/examples/HDF5_Examples_options.cmake +++ b/config/examples/HDF5_Examples_options.cmake @@ -14,14 +14,14 @@ #### format: set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DXXX:YY=ZZZZ") ### #### DEFAULT: ### #### BUILD_SHARED_LIBS:BOOL=OFF ### -#### H5EX_BUILD_C:BOOL=ON ### -#### H5EX_BUILD_HL:BOOL=ON ### -#### H5EX_BUILD_CXX:BOOL=OFF ### -#### H5EX_BUILD_FORTRAN:BOOL=OFF ### -#### H5EX_BUILD_JAVA:BOOL=OFF ### -#### H5EX_BUILD_FILTERS:BOOL=OFF ### -#### H5EX_BUILD_TESTING:BOOL=OFF ### -#### H5EX_ENABLE_PARALLEL:BOOL=OFF ### +#### H5EXAMPLE_BUILD_C:BOOL=ON ### +#### H5EXAMPLE_BUILD_HL:BOOL=ON ### +#### H5EXAMPLE_BUILD_CXX:BOOL=OFF ### +#### H5EXAMPLE_BUILD_FORTRAN:BOOL=OFF ### +#### H5EXAMPLE_BUILD_JAVA:BOOL=OFF ### +#### H5EXAMPLE_BUILD_FILTERS:BOOL=OFF ### +#### H5EXAMPLE_BUILD_TESTING:BOOL=OFF ### +#### H5EXAMPLE_ENABLE_PARALLEL:BOOL=OFF ### ############################################################################################# ### uncomment/comment and change the following lines for other configuration options @@ -44,29 +44,29 @@ ############################################################################################# #### languages #### ### disable C builds -#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DH5EX_BUILD_C:BOOL=OFF") +#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DH5EXAMPLE_BUILD_C:BOOL=OFF") ### enable HL builds -#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DH5EX_BUILD_HL:BOOL=ON") +#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DH5EXAMPLE_BUILD_HL:BOOL=ON") ### enable C++ builds -#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DH5EX_BUILD_CXX:BOOL=ON") +#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DH5EXAMPLE_BUILD_CXX:BOOL=ON") ### enable Fortran builds -#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DH5EX_BUILD_FORTRAN:BOOL=ON") +#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DH5EXAMPLE_BUILD_FORTRAN:BOOL=ON") ### enable JAVA builds -#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DH5EX_BUILD_JAVA:BOOL=ON") +#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DH5EXAMPLE_BUILD_JAVA:BOOL=ON") ############################################################################################# ### enable FILTERS builds -#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DH5EX_BUILD_FILTERS:BOOL=ON") +#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DH5EXAMPLE_BUILD_FILTERS:BOOL=ON") ### default HDF5_PLUGIN_PATH to where the filter libraries are located #set(ENV{HDF5_PLUGIN_PATH} "${INSTALLDIR}/lib/plugin") ############################################################################################# ### enable parallel program builds -#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DH5EX_ENABLE_PARALLEL:BOOL=ON") +#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DH5EXAMPLE_ENABLE_PARALLEL:BOOL=ON") ############################################################################################# ### match the hdf5 library namespace @@ -74,7 +74,7 @@ set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_NAMESPACE:STRING=hdf5::") ############################################################################################# ### enable test program builds, requires reference files in testfiles subdirectory -#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DH5EX_BUILD_TESTING:BOOL=ON") -#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DH5EX_COMPARE_TESTING:BOOL=ON") +#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DH5EXAMPLE_BUILD_TESTING:BOOL=ON") +#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DH5EXAMPLE_COMPARE_TESTING:BOOL=ON") ############################################################################################# diff --git a/release_docs/CHANGELOG.md b/release_docs/CHANGELOG.md index 6aabc47501c..e69aa8b106f 100644 --- a/release_docs/CHANGELOG.md +++ b/release_docs/CHANGELOG.md @@ -133,6 +133,10 @@ For releases prior to version 2.0.0, please see the release.txt file and for mor Changed the zlib-ng CMake logic to prefer the native zlib-ng library. Added `#ifdef` around the compression function calls. Added including the correct header file with the same `#ifdef`. +### Renamed HDF5Examples build options from `H5EX_