diff --git a/.github/workflows/main-cmake.yml b/.github/workflows/main-cmake.yml index 6de677ce080..72738390397 100644 --- a/.github/workflows/main-cmake.yml +++ b/.github/workflows/main-cmake.yml @@ -161,7 +161,6 @@ jobs: -DBUILD_SHARED_LIBS:BOOL=${{ matrix.shared }} \ -DHDF5_ENABLE_ALL_WARNINGS:BOOL=ON \ -DHDF5_ENABLE_DOXY_WARNINGS:BOOL=ON \ - -DHDF5_BUILD_GENERATORS:BOOL=ON \ -DHDF5_ENABLE_PARALLEL:BOOL=${{ matrix.parallel }} \ -DHDF5_BUILD_CPP_LIB:BOOL=${{ matrix.cpp }} \ -DHDF5_BUILD_FORTRAN:BOOL=${{ matrix.fortran }} \ @@ -195,7 +194,6 @@ jobs: -DHDF5_ENABLE_ALL_WARNINGS:BOOL=ON \ -DHDF5_ENABLE_THREADSAFE:BOOL=ON \ -DHDF5_ENABLE_CONCURRENCY:BOOL=OFF \ - -DHDF5_BUILD_GENERATORS:BOOL=ON \ -DHDF5_ENABLE_PARALLEL:BOOL=${{ matrix.parallel }} \ -DHDF5_BUILD_CPP_LIB:BOOL=OFF \ -DHDF5_BUILD_FORTRAN:BOOL=OFF \ @@ -226,7 +224,6 @@ jobs: -DHDF5_ENABLE_ALL_WARNINGS=ON \ -DHDF5_ENABLE_THREADSAFE:BOOL=OFF \ -DHDF5_ENABLE_CONCURRENCY:BOOL=ON \ - -DHDF5_BUILD_GENERATORS:BOOL=ON \ -DHDF5_ENABLE_PARALLEL:BOOL=${{ matrix.parallel }} \ -DHDF5_BUILD_CPP_LIB:BOOL=OFF \ -DHDF5_BUILD_FORTRAN:BOOL=OFF \ @@ -425,7 +422,6 @@ jobs: -DBUILD_SHARED_LIBS:BOOL=OFF \ -DBUILD_STATIC_LIBS:BOOL=ON \ -DHDF5_ENABLE_ALL_WARNINGS:BOOL=ON \ - -DHDF5_BUILD_GENERATORS:BOOL=ON \ -DHDF5_ENABLE_PARALLEL:BOOL=${{ matrix.parallel }} \ -DHDF5_BUILD_CPP_LIB:BOOL=${{ matrix.cpp }} \ -DHDF5_BUILD_FORTRAN:BOOL=${{ matrix.fortran }} \ diff --git a/CMakeLists.txt b/CMakeLists.txt index 6fa19495600..e1316613b67 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -669,9 +669,6 @@ if (MSVC) set (WIN_LINK_FLAGS "") endif () -# Do not generate test programs by default -option (HDF5_BUILD_GENERATORS "Build Test Generators" OFF) - #----------------------------------------------------------------------------- # Add some definitions for Debug Builds #----------------------------------------------------------------------------- diff --git a/CMakePresets.json b/CMakePresets.json index cd8d19ad8f4..0ca3173d0f3 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -121,7 +121,6 @@ "cacheVariables": { "HDF_PACKAGE_NAMESPACE": {"type": "STRING", "value": "hdf5::"}, "HDF5_INSTALL_MOD_FORTRAN": "NO", - "HDF5_BUILD_GENERATORS": "ON", "HDF5_ENABLE_ALL_WARNINGS": "ON", "HDF5_MINGW_STATIC_GCC_LIBS": "ON", "HDF_TEST_EXPRESS": "2" diff --git a/config/cmake/cacheinit.cmake b/config/cmake/cacheinit.cmake index c6a41549641..e242291956a 100644 --- a/config/cmake/cacheinit.cmake +++ b/config/cmake/cacheinit.cmake @@ -30,8 +30,6 @@ set (HDF5_BUILD_JAVA ON CACHE BOOL "Build JAVA support" FORCE) set (HDF5_INSTALL_MOD_FORTRAN "NO" CACHE STRING "Copy FORTRAN mod files to include directory (NO SHARED STATIC)" FORCE) set_property (CACHE HDF5_INSTALL_MOD_FORTRAN PROPERTY STRINGS NO SHARED STATIC) -set (HDF5_BUILD_GENERATORS ON CACHE BOOL "Build Test Generators" FORCE) - set (MPIEXEC_MAX_NUMPROCS "4" CACHE STRING "Minimum number of processes for HDF parallel tests" FORCE) set (HDF5_ENABLE_ALL_WARNINGS ON CACHE BOOL "Enable all warnings" FORCE) diff --git a/doxygen/dox/cookbook/Presets.dox b/doxygen/dox/cookbook/Presets.dox index 203af3ebee1..e362ef08564 100644 --- a/doxygen/dox/cookbook/Presets.dox +++ b/doxygen/dox/cookbook/Presets.dox @@ -544,7 +544,6 @@ settings for the StdShar presets. The ci-StdShar preset sets the following cache variables: \li "HDF_PACKAGE_NAMESPACE": {"type": "STRING", "value": "hdf5::"} \li "HDF5_INSTALL_MOD_FORTRAN": "NO" -\li "HDF5_BUILD_GENERATORS": "ON" \li "HDF5_ENABLE_ALL_WARNINGS": "ON" \li "HDF5_MINGW_STATIC_GCC_LIBS": "ON" \li "HDF_TEST_EXPRESS": "2" diff --git a/hl/test/CMakeLists.txt b/hl/test/CMakeLists.txt index 68e8adecad8..0ad933b81fc 100644 --- a/hl/test/CMakeLists.txt +++ b/hl/test/CMakeLists.txt @@ -87,60 +87,58 @@ endif () # This executable is used to generate test files for the test_ds test. # It should only be run during development when new test files are needed # -------------------------------------------------------------------- -if (HDF5_BUILD_GENERATORS) - add_executable (hl_gen_test_ds gen_test_ds.c) - target_compile_options(hl_gen_test_ds PRIVATE "${HDF5_CMAKE_C_FLAGS}") - target_include_directories (hl_gen_test_ds PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$:${MPI_C_INCLUDE_DIRS}>") - if (NOT BUILD_SHARED_LIBS) - TARGET_C_PROPERTIES (hl_gen_test_ds STATIC) - target_link_libraries (hl_gen_test_ds PRIVATE - ${HDF5_HL_LIB_TARGET} - ${HDF5_TEST_LIB_TARGET} - ${HDF5_LIB_TARGET} - ) - else () - TARGET_C_PROPERTIES (hl_gen_test_ds SHARED) - target_link_libraries (hl_gen_test_ds PRIVATE - ${HDF5_HL_LIBSH_TARGET} - ${HDF5_TEST_LIBSH_TARGET} - ${HDF5_LIBSH_TARGET} - ) - endif () - set_target_properties (hl_gen_test_ds PROPERTIES FOLDER test/hl/gen) +add_executable (hl_gen_test_ds gen_test_ds.c) +target_compile_options(hl_gen_test_ds PRIVATE "${HDF5_CMAKE_C_FLAGS}") +target_include_directories (hl_gen_test_ds PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$:${MPI_C_INCLUDE_DIRS}>") +if (NOT BUILD_SHARED_LIBS) + TARGET_C_PROPERTIES (hl_gen_test_ds STATIC) + target_link_libraries (hl_gen_test_ds PRIVATE + ${HDF5_HL_LIB_TARGET} + ${HDF5_TEST_LIB_TARGET} + ${HDF5_LIB_TARGET} + ) +else () + TARGET_C_PROPERTIES (hl_gen_test_ds SHARED) + target_link_libraries (hl_gen_test_ds PRIVATE + ${HDF5_HL_LIBSH_TARGET} + ${HDF5_TEST_LIBSH_TARGET} + ${HDF5_LIBSH_TARGET} + ) +endif () +set_target_properties (hl_gen_test_ds PROPERTIES FOLDER test/hl/gen) - #----------------------------------------------------------------------------- - # Add Target to clang-format - #----------------------------------------------------------------------------- - if (HDF5_ENABLE_FORMATTERS) - clang_format (HDF5_HL_TEST_hl_gen_test_ds_FORMAT hl_gen_test_ds) - endif () +#----------------------------------------------------------------------------- +# Add Target to clang-format +#----------------------------------------------------------------------------- +if (HDF5_ENABLE_FORMATTERS) + clang_format (HDF5_HL_TEST_hl_gen_test_ds_FORMAT hl_gen_test_ds) +endif () - add_executable (hl_gen_test_ld gen_test_ld.c) - target_compile_options(hl_gen_test_ld PRIVATE "${HDF5_CMAKE_C_FLAGS}") - target_include_directories (hl_gen_test_ld PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$:${MPI_C_INCLUDE_DIRS}>") - if (NOT BUILD_SHARED_LIBS) - TARGET_C_PROPERTIES (hl_gen_test_ld STATIC) - target_link_libraries (hl_gen_test_ld PRIVATE - ${HDF5_HL_LIB_TARGET} - ${HDF5_TEST_LIB_TARGET} - ${HDF5_LIB_TARGET} - ) - else () - TARGET_C_PROPERTIES (hl_gen_test_ld SHARED) - target_link_libraries (hl_gen_test_ld PRIVATE - ${HDF5_HL_LIBSH_TARGET} - ${HDF5_TEST_LIBSH_TARGET} - ${HDF5_LIBSH_TARGET} - ) - endif () - set_target_properties (hl_gen_test_ld PROPERTIES FOLDER test/hl/gen) +add_executable (hl_gen_test_ld gen_test_ld.c) +target_compile_options(hl_gen_test_ld PRIVATE "${HDF5_CMAKE_C_FLAGS}") +target_include_directories (hl_gen_test_ld PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$:${MPI_C_INCLUDE_DIRS}>") +if (NOT BUILD_SHARED_LIBS) + TARGET_C_PROPERTIES (hl_gen_test_ld STATIC) + target_link_libraries (hl_gen_test_ld PRIVATE + ${HDF5_HL_LIB_TARGET} + ${HDF5_TEST_LIB_TARGET} + ${HDF5_LIB_TARGET} + ) +else () + TARGET_C_PROPERTIES (hl_gen_test_ld SHARED) + target_link_libraries (hl_gen_test_ld PRIVATE + ${HDF5_HL_LIBSH_TARGET} + ${HDF5_TEST_LIBSH_TARGET} + ${HDF5_LIBSH_TARGET} + ) +endif () +set_target_properties (hl_gen_test_ld PROPERTIES FOLDER test/hl/gen) - #----------------------------------------------------------------------------- - # Add Target to clang-format - #----------------------------------------------------------------------------- - if (HDF5_ENABLE_FORMATTERS) - clang_format (HDF5_HL_TEST_hl_gen_test_ld_FORMAT hl_gen_test_ld) - endif () +#----------------------------------------------------------------------------- +# Add Target to clang-format +#----------------------------------------------------------------------------- +if (HDF5_ENABLE_FORMATTERS) + clang_format (HDF5_HL_TEST_hl_gen_test_ld_FORMAT hl_gen_test_ld) endif () if (HDF5_TEST_SERIAL) diff --git a/release_docs/AutotoolsToCMakeOptions.md b/release_docs/AutotoolsToCMakeOptions.md index 22c2cf99f28..9972853e8b5 100644 --- a/release_docs/AutotoolsToCMakeOptions.md +++ b/release_docs/AutotoolsToCMakeOptions.md @@ -68,7 +68,6 @@ release_docs/INSTALL_CMake.txt file for more information on the CMake build syst | instrument[Enable library instrumentation of optimization tracing (only used with parallel builds). [default=yes if a parallel debug build, otherwise no]] | HDF5_ENABLE_INSTRUMENT "Instrument The library" [OFF] | | | dconv-exception[Check exception handling functions during data conversions [default=yes]] | HDF5_WANT_DCONV_EXCEPTION "exception handling functions is checked during data conversions" [ON] | | | dconv-accuracy[Guarantee data accuracy during data conversions [default=yes]] | HDF5_WANT_DATA_ACCURACY "IF data accuracy is guaranteed during data conversions" [ON] | | -| build-all[Build helper programs that only developers should need [default=no]] | HDF5_BUILD_GENERATORS "Build Test Generators" [OFF] | | | deprecated-symbols[Enable deprecated public API symbols. [default=yes (unless build mode = clean)]] | HDF5_ENABLE_DEPRECATED_SYMBOLS "Enable deprecated public API symbols" [ON] | | | strict-format-checks[Enable strict file format checks. [default=yes if debug build, otherwise no]] | HDF5_STRICT_FORMAT_CHECKS "Whether to perform strict file format checks" [OFF] | | | preadwrite[Enable using pread/pwrite instead of read/write in sec2/log/core VFDs. [default=yes if pread/pwrite are present]] | HDF5_ENABLE_PREADWRITE "Use pread/pwrite in sec2/log/core VFDs in place of read/write (when available)" [ON] | | diff --git a/release_docs/INSTALL_CMake.txt b/release_docs/INSTALL_CMake.txt index 99c2cfb4a2c..aa8afe1d890 100644 --- a/release_docs/INSTALL_CMake.txt +++ b/release_docs/INSTALL_CMake.txt @@ -864,7 +864,6 @@ HDF5_ENABLE_TRACE "Enable API tracing capability" HDF5_ENABLE_USING_MEMCHECKER "Indicate that a memory checker is used" OFF HDF5_ENABLE_MAP_API "Build the map API" OFF HDF5_GENERATE_HEADERS "Rebuild Generated Files" OFF -HDF5_BUILD_GENERATORS "Build Test Generators" OFF HDF5_JAVA_PACK_JRE "Package a JRE installer directory" OFF HDF5_NO_PACKAGES "Do not include CPack Packaging" OFF diff --git a/test/CMakeTests.cmake b/test/CMakeTests.cmake index 08a519e9772..dfa64c3aa08 100644 --- a/test/CMakeTests.cmake +++ b/test/CMakeTests.cmake @@ -1119,55 +1119,51 @@ endif () ### T H E G E N E R A T O R S ### ############################################################################## ############################################################################## +macro (ADD_H5_GENERATOR genfile) + add_executable (${genfile} ${HDF5_TEST_SOURCE_DIR}/${genfile}.c) + target_include_directories (${genfile} PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$:${MPI_C_INCLUDE_DIRS}>") + if (NOT BUILD_SHARED_LIBS) + TARGET_C_PROPERTIES (${genfile} STATIC) + target_link_libraries (${genfile} PRIVATE ${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET}) + else () + TARGET_C_PROPERTIES (${genfile} SHARED) + target_link_libraries (${genfile} PRIVATE ${HDF5_TEST_LIBSH_TARGET} ${HDF5_LIBSH_TARGET}) + endif () + set_target_properties (${genfile} PROPERTIES FOLDER generator/test) -if (HDF5_BUILD_GENERATORS) - macro (ADD_H5_GENERATOR genfile) - add_executable (${genfile} ${HDF5_TEST_SOURCE_DIR}/${genfile}.c) - target_include_directories (${genfile} PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$:${MPI_C_INCLUDE_DIRS}>") - if (NOT BUILD_SHARED_LIBS) - TARGET_C_PROPERTIES (${genfile} STATIC) - target_link_libraries (${genfile} PRIVATE ${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET}) - else () - TARGET_C_PROPERTIES (${genfile} SHARED) - target_link_libraries (${genfile} PRIVATE ${HDF5_TEST_LIBSH_TARGET} ${HDF5_LIBSH_TARGET}) - endif () - set_target_properties (${genfile} PROPERTIES FOLDER generator/test) - - #----------------------------------------------------------------------------- - # Add Target to clang-format - #----------------------------------------------------------------------------- - if (HDF5_ENABLE_FORMATTERS) - clang_format (HDF5_TEST_${genfile}_FORMAT ${genfile}) - endif () - endmacro () - - # generator executables - set (H5_GENERATORS - gen_bad_offset - gen_bad_ohdr - gen_bogus - gen_bounds - gen_cross - gen_deflate - gen_filters - gen_new_array - gen_new_fill - gen_new_group - gen_new_mtime - gen_new_super - gen_noencoder - gen_nullspace - gen_udlinks - space_overflow - gen_filespace - gen_specmetaread - gen_sizes_lheap - gen_file_image - gen_plist - ) + #----------------------------------------------------------------------------- + # Add Target to clang-format + #----------------------------------------------------------------------------- + if (HDF5_ENABLE_FORMATTERS) + clang_format (HDF5_TEST_${genfile}_FORMAT ${genfile}) + endif () +endmacro () - foreach (h5_gen ${H5_GENERATORS}) - ADD_H5_GENERATOR (${h5_gen}) - endforeach () +# generator executables +set (H5_GENERATORS + gen_bad_offset + gen_bad_ohdr + gen_bogus + gen_bounds + gen_cross + gen_deflate + gen_filters + gen_new_array + gen_new_fill + gen_new_group + gen_new_mtime + gen_new_super + gen_noencoder + gen_nullspace + gen_udlinks + space_overflow + gen_filespace + gen_specmetaread + gen_sizes_lheap + gen_file_image + gen_plist +) -endif () +foreach (h5_gen ${H5_GENERATORS}) + ADD_H5_GENERATOR (${h5_gen}) +endforeach () diff --git a/tools/test/CMakeLists.txt b/tools/test/CMakeLists.txt index 43d488e503e..78acb056682 100644 --- a/tools/test/CMakeLists.txt +++ b/tools/test/CMakeLists.txt @@ -18,74 +18,72 @@ set (HDF5_TOOLS_MISC # h5perf does not use gentest like other tools, excluded here ) -if (HDF5_BUILD_GENERATORS) - # Build main gentest - add_executable(h5gentest ${HDF5_TOOLS_TEST_SOURCE_DIR}/h5gentest.c) - target_include_directories (h5gentest PRIVATE - "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};" - "$<$:${MPI_C_INCLUDE_DIRS}>") +# Build main gentest +add_executable(h5gentest ${HDF5_TOOLS_TEST_SOURCE_DIR}/h5gentest.c) +target_include_directories (h5gentest PRIVATE + "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};" + "$<$:${MPI_C_INCLUDE_DIRS}>") + +if (HDF5_BUILD_STATIC_TOOLS) + TARGET_C_PROPERTIES (h5gentest STATIC) + target_link_libraries (h5gentest PRIVATE ${HDF5_LIB_TARGET}) +else () + TARGET_C_PROPERTIES (h5gentest SHARED) + target_link_libraries (h5gentest PRIVATE ${HDF5_LIBSH_TARGET}) +endif () + +target_include_directories(h5gentest PRIVATE + "${HDF5_TOOLS_TEST_SOURCE_DIR}/misc" +) + +# Build object libraries for gentest +foreach(tool ${HDF5_TOOLS};${HDF5_TOOLS_MISC}) + if (${tool} IN_LIST HDF5_TOOLS_MISC) + add_library(${tool}gentest OBJECT ${HDF5_TOOLS_TEST_SOURCE_DIR}/misc/${tool}gentest.c) + target_include_directories (${tool}gentest PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_TEST_SRC_DIR};${HDF5_TOOLS_TST_DIR};${HDF5_TOOLS_ROOT_DIR}/misc;${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_BINARY_DIR};$<$:${MPI_C_INCLUDE_DIRS}>") + else() + add_library(${tool}gentest OBJECT ${HDF5_TOOLS_TEST_SOURCE_DIR}/${tool}/${tool}gentest.c) + target_include_directories (${tool}gentest PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_TEST_SRC_DIR};${HDF5_TOOLS_TST_DIR};${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_BINARY_DIR};$<$:${MPI_C_INCLUDE_DIRS}>") + endif() if (HDF5_BUILD_STATIC_TOOLS) - TARGET_C_PROPERTIES (h5gentest STATIC) - target_link_libraries (h5gentest PRIVATE ${HDF5_LIB_TARGET}) + TARGET_C_PROPERTIES(${tool}gentest STATIC) + target_link_libraries (${tool}gentest PRIVATE + ${HDF5_LIB_TARGET} + ${HDF5_TOOLS_LIB_TARGET} + ${HDF5_REQUIRED_LIBRARIES} # For math lib + ) else () - TARGET_C_PROPERTIES (h5gentest SHARED) - target_link_libraries (h5gentest PRIVATE ${HDF5_LIBSH_TARGET}) + TARGET_C_PROPERTIES(${tool}gentest SHARED) + target_link_libraries (${tool}gentest PRIVATE + ${HDF5_LIBSH_TARGET} + ${HDF5_TOOLS_LIBSH_TARGET} + ${HDF5_REQUIRED_LIBRARIES} + ) endif () target_include_directories(h5gentest PRIVATE - "${HDF5_TOOLS_TEST_SOURCE_DIR}/misc" + "${HDF5_TOOLS_TEST_SOURCE_DIR}/${tool}" ) - # Build object libraries for gentest - foreach(tool ${HDF5_TOOLS};${HDF5_TOOLS_MISC}) - if (${tool} IN_LIST HDF5_TOOLS_MISC) - add_library(${tool}gentest OBJECT ${HDF5_TOOLS_TEST_SOURCE_DIR}/misc/${tool}gentest.c) - target_include_directories (${tool}gentest PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_TEST_SRC_DIR};${HDF5_TOOLS_TST_DIR};${HDF5_TOOLS_ROOT_DIR}/misc;${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_BINARY_DIR};$<$:${MPI_C_INCLUDE_DIRS}>") - else() - add_library(${tool}gentest OBJECT ${HDF5_TOOLS_TEST_SOURCE_DIR}/${tool}/${tool}gentest.c) - target_include_directories (${tool}gentest PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_TEST_SRC_DIR};${HDF5_TOOLS_TST_DIR};${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_BINARY_DIR};$<$:${MPI_C_INCLUDE_DIRS}>") - endif() - - if (HDF5_BUILD_STATIC_TOOLS) - TARGET_C_PROPERTIES(${tool}gentest STATIC) - target_link_libraries (${tool}gentest PRIVATE - ${HDF5_LIB_TARGET} - ${HDF5_TOOLS_LIB_TARGET} - ${HDF5_REQUIRED_LIBRARIES} # For math lib - ) - else () - TARGET_C_PROPERTIES(${tool}gentest SHARED) - target_link_libraries (${tool}gentest PRIVATE - ${HDF5_LIBSH_TARGET} - ${HDF5_TOOLS_LIBSH_TARGET} - ${HDF5_REQUIRED_LIBRARIES} - ) - endif () - - target_include_directories(h5gentest PRIVATE - "${HDF5_TOOLS_TEST_SOURCE_DIR}/${tool}" - ) - - target_link_libraries(h5gentest PRIVATE ${tool}gentest) - endforeach() + target_link_libraries(h5gentest PRIVATE ${tool}gentest) +endforeach() - set_target_properties (h5gentest PROPERTIES FOLDER generator/tools) - - #----------------------------------------------------------------------------- - # Add Targets to clang-format - #----------------------------------------------------------------------------- - if (HDF5_ENABLE_FORMATTERS) - clang_format (HDF5_TOOLS_TEST_H5COPY_FORMAT h5gentest) - foreach(tool ${HDF5_TOOLS}) - string(TOUPPER ${tool} tool_upper) - clang_format (HDF5_TOOLS_TEST_${tool_upper}_FORMAT ${tool}gentest) - endforeach() - endif () +set_target_properties (h5gentest PROPERTIES FOLDER generator/tools) - #add_test (NAME h5gentest COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $) +#----------------------------------------------------------------------------- +# Add Targets to clang-format +#----------------------------------------------------------------------------- +if (HDF5_ENABLE_FORMATTERS) + clang_format (HDF5_TOOLS_TEST_H5COPY_FORMAT h5gentest) + foreach(tool ${HDF5_TOOLS}) + string(TOUPPER ${tool} tool_upper) + clang_format (HDF5_TOOLS_TEST_${tool_upper}_FORMAT ${tool}gentest) + endforeach() endif () +#add_test (NAME h5gentest COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $) + #-- Add the h5diff tests add_subdirectory (h5diff) diff --git a/tools/test/misc/CMakeLists.txt b/tools/test/misc/CMakeLists.txt index 79a9ad9f44c..05994d2c9cc 100644 --- a/tools/test/misc/CMakeLists.txt +++ b/tools/test/misc/CMakeLists.txt @@ -4,29 +4,27 @@ project (HDF5_TOOLS_TEST_MISC C) # -------------------------------------------------------------------- # Add the misc test executables # -------------------------------------------------------------------- -if (HDF5_BUILD_GENERATORS) - add_executable (h5clear_gentest ${HDF5_TOOLS_TEST_MISC_SOURCE_DIR}/h5clear_gentest.c) - target_include_directories (h5clear_gentest PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_TEST_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$:${MPI_C_INCLUDE_DIRS}>") - if (HDF5_BUILD_STATIC_TOOLS) - TARGET_C_PROPERTIES (h5clear_gentest STATIC) - target_link_libraries (h5clear_gentest PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET}) - else () - TARGET_C_PROPERTIES (h5clear_gentest SHARED) - target_link_libraries (h5clear_gentest PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_TEST_LIBSH_TARGET}) - endif () - set_target_properties (h5clear_gentest PROPERTIES FOLDER tools) - #add_test (NAME H5CLEAR-h5clear_gentest COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $) +add_executable (h5clear_gentest ${HDF5_TOOLS_TEST_MISC_SOURCE_DIR}/h5clear_gentest.c) +target_include_directories (h5clear_gentest PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_TEST_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$:${MPI_C_INCLUDE_DIRS}>") +if (HDF5_BUILD_STATIC_TOOLS) + TARGET_C_PROPERTIES (h5clear_gentest STATIC) + target_link_libraries (h5clear_gentest PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET}) +else () + TARGET_C_PROPERTIES (h5clear_gentest SHARED) + target_link_libraries (h5clear_gentest PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_TEST_LIBSH_TARGET}) +endif () +set_target_properties (h5clear_gentest PROPERTIES FOLDER tools) +#add_test (NAME H5CLEAR-h5clear_gentest COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $) - #----------------------------------------------------------------------------- - # Add Target to clang-format - #----------------------------------------------------------------------------- - if (HDF5_ENABLE_FORMATTERS) - clang_format (HDF5_TOOLS_TEST_MISC_h5clear_gentest_FORMAT h5clear_gentest) - endif () +#----------------------------------------------------------------------------- +# Add Target to clang-format +#----------------------------------------------------------------------------- +if (HDF5_ENABLE_FORMATTERS) + clang_format (HDF5_TOOLS_TEST_MISC_h5clear_gentest_FORMAT h5clear_gentest) +endif () - add_subdirectory (vds) +add_subdirectory (vds) -endif () add_executable (h5repart_test ${HDF5_TOOLS_TEST_MISC_SOURCE_DIR}/repart_test.c) target_include_directories (h5repart_test PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$:${MPI_C_INCLUDE_DIRS}>")