diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2020-01-10 12:49:29 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2020-01-10 12:49:29 (GMT) |
| commit | 2600c358a50c2952cb37c88005425b0ca10d0278 (patch) | |
| tree | b3fafdffe47564053322335e562b805d5b778222 /tools | |
| parent | 9b82f8c0ac010b019f1cfc98c638c7ec6770a844 (diff) | |
| download | hdf5-2600c358a50c2952cb37c88005425b0ca10d0278.zip hdf5-2600c358a50c2952cb37c88005425b0ca10d0278.tar.gz hdf5-2600c358a50c2952cb37c88005425b0ca10d0278.tar.bz2 | |
io_timer.c uses a parallel lib function
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/test/perform/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | tools/test/perform/sio_perf.h | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/tools/test/perform/CMakeLists.txt b/tools/test/perform/CMakeLists.txt index f250065..a01a88f 100644 --- a/tools/test/perform/CMakeLists.txt +++ b/tools/test/perform/CMakeLists.txt @@ -21,7 +21,7 @@ endif () set_target_properties (h5perf_serial PROPERTIES FOLDER perform) if (HDF5_BUILD_PERFORM_STANDALONE) - #-- Adding test for h5perf_serial_alone + #-- Adding test for h5perf_serial_alone - io_timer.c includes set (h5perf_serial_alone_SOURCES ${HDF5_TOOLS_DIR}/lib/io_timer.c ${HDF5_TOOLS_TEST_PERFORM_SOURCE_DIR}/sio_perf.c @@ -32,10 +32,10 @@ if (HDF5_BUILD_PERFORM_STANDALONE) target_include_directories (h5perf_serial_alone PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};${HDF5_TOOLS_DIR}/lib;$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>") if (NOT BUILD_SHARED_LIBS) TARGET_C_PROPERTIES (h5perf_serial_alone STATIC) - target_link_libraries (h5perf_serial_alone PRIVATE ${HDF5_LIB_TARGET}) + target_link_libraries (h5perf_serial_alone PRIVATE ${HDF5_LIB_TARGET} "$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_LIBRARIES}>") else () TARGET_C_PROPERTIES (h5perf_serial_alone SHARED) - target_link_libraries (h5perf_serial_alone PRIVATE ${HDF5_LIBSH_TARGET}) + target_link_libraries (h5perf_serial_alone PRIVATE ${HDF5_LIBSH_TARGET} "$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_LIBRARIES}>") endif () set_target_properties (h5perf_serial_alone PROPERTIES FOLDER perform) set_property (TARGET h5perf_serial_alone diff --git a/tools/test/perform/sio_perf.h b/tools/test/perform/sio_perf.h index ed4b13d..d26c78b 100644 --- a/tools/test/perform/sio_perf.h +++ b/tools/test/perform/sio_perf.h @@ -19,7 +19,6 @@ #include "h5tools.h" #include "h5tools_utils.h" #else -#undef H5_HAVE_PARALLEL #include "io_timer.h" #include "sio_standalone.h" #endif |