diff options
author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2023-09-26 13:46:15 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-26 13:46:15 (GMT) |
commit | 830bf561e1236308cdffe0c519c6e779ec0929e3 (patch) | |
tree | 9ccbc8739c6d47dd8611fb9c24dca12d38662850 /examples | |
parent | 5bd7cf645342bdbcd9faafdb920ffef43a41e2e8 (diff) | |
download | hdf5-830bf561e1236308cdffe0c519c6e779ec0929e3.zip hdf5-830bf561e1236308cdffe0c519c6e779ec0929e3.tar.gz hdf5-830bf561e1236308cdffe0c519c6e779ec0929e3.tar.bz2 |
Merge CMake,doxygen changes from develop,1.10 branches (#3578)
* Merge CMake,doxygen changes from develop,1.10 branches
* revert incorrect option in AT TS build
* Use variable for ignore-eol usage.
* Add last_test depends logic
* Just print status on CMake below 3.14
Diffstat (limited to 'examples')
-rw-r--r-- | examples/CMakeTests.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/CMakeTests.cmake b/examples/CMakeTests.cmake index 30f73c4..e2cd826 100644 --- a/examples/CMakeTests.cmake +++ b/examples/CMakeTests.cmake @@ -117,8 +117,8 @@ if (H5_HAVE_PARALLEL AND HDF5_TEST_PARALLEL AND NOT WIN32) add_test (NAME MPI_TEST_EXAMPLES-${parallel_example} COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:${parallel_example}> ${MPIEXEC_POSTFLAGS}) else () add_test (NAME MPI_TEST_EXAMPLES-${parallel_example} COMMAND "${CMAKE_COMMAND}" - -D "TEST_PROGRAM=${MPIEXEC_EXECUTABLE};${MPIEXEC_NUMPROC_FLAG};${NUMPROCS};${MPIEXEC_PREFLAGS};$<TARGET_FILE:${parallel_example}>;${MPIEXEC_POSTFLAGS}" - -D "TEST_ARGS:STRING=" + -D "TEST_PROGRAM=${MPIEXEC_EXECUTABLE}" + -D "TEST_ARGS:STRING=${MPIEXEC_NUMPROC_FLAG};${NUMPROCS};${MPIEXEC_PREFLAGS};$<TARGET_FILE:${parallel_example}>;${MPIEXEC_POSTFLAGS}" -D "TEST_EXPECT=0" -D "TEST_SKIP_COMPARE=TRUE" -D "TEST_OUTPUT=${parallel_example}.out" |