diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2019-07-09 20:35:51 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2019-07-09 20:35:51 (GMT) |
commit | c33f2cbf18b4cc0aafedfe2d1cc29ed7730c91f6 (patch) | |
tree | 4dea4f12bddcd8dcd114a611173809bbdeda3686 /tools | |
parent | de217a64998c841e784c3f60e031da9e0041feb5 (diff) | |
parent | 88ab4b144bcf8454be9eff8800706c0abb404de1 (diff) | |
download | hdf5-c33f2cbf18b4cc0aafedfe2d1cc29ed7730c91f6.zip hdf5-c33f2cbf18b4cc0aafedfe2d1cc29ed7730c91f6.tar.gz hdf5-c33f2cbf18b4cc0aafedfe2d1cc29ed7730c91f6.tar.bz2 |
Merge pull request #1791 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '88ab4b144bcf8454be9eff8800706c0abb404de1':
fix var name
Fix compile error with ifdef H5_HAVE_GETHOSTNAME
perf program can only be built on unix platforms
Declaration needed for parallel standalone
Correct test use of library name
Change how name is retrieved
Move before null check
HDFFV-10581 remove special name checking
HDFFV-10581 fix locations for static pdb files
Diffstat (limited to 'tools')
-rw-r--r-- | tools/lib/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tools/test/perform/CMakeLists.txt | 28 | ||||
-rw-r--r-- | tools/test/perform/pio_standalone.c | 4 |
3 files changed, 20 insertions, 14 deletions
diff --git a/tools/lib/CMakeLists.txt b/tools/lib/CMakeLists.txt index e9dfcaa..75ed627 100644 --- a/tools/lib/CMakeLists.txt +++ b/tools/lib/CMakeLists.txt @@ -85,7 +85,7 @@ if (HDF5_EXPORTED_TARGETS) INSTALL_TARGET_PDB (${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_INSTALL_BIN_DIR} toolslibraries) endif () if (NOT ONLY_SHARED_LIBS) - INSTALL_TARGET_PDB (${HDF5_TOOLS_LIB_TARGET} ${HDF5_INSTALL_BIN_DIR} toolslibraries) + INSTALL_TARGET_PDB (${HDF5_TOOLS_LIB_TARGET} ${HDF5_INSTALL_LIB_DIR} toolslibraries) endif () install ( diff --git a/tools/test/perform/CMakeLists.txt b/tools/test/perform/CMakeLists.txt index 5995b60..38dd605 100644 --- a/tools/test/perform/CMakeLists.txt +++ b/tools/test/perform/CMakeLists.txt @@ -133,20 +133,22 @@ endif () set_target_properties (zip_perf PROPERTIES FOLDER perform) if (H5_HAVE_PARALLEL AND BUILD_TESTING) - #-- Adding test for perf - set (perf_SOURCES - ${HDF5_TOOLS_TEST_PERFORM_SOURCE_DIR}/perf.c - ) - add_executable (perf ${perf_SOURCES}) - target_include_directories (perf PRIVATE "${HDF5_TEST_SRC_DIR};${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>") - if (NOT BUILD_SHARED_LIBS) - TARGET_C_PROPERTIES (perf STATIC) - target_link_libraries (perf PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET}) - else () - TARGET_C_PROPERTIES (perf SHARED) - target_link_libraries (perf PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_TEST_LIBSH_TARGET} ${HDF5_LIBSH_TARGET}) + if (UNIX) + #-- Adding test for perf - only on unix systems + set (perf_SOURCES + ${HDF5_TOOLS_TEST_PERFORM_SOURCE_DIR}/perf.c + ) + add_executable (perf ${perf_SOURCES}) + target_include_directories (perf PRIVATE "${HDF5_TEST_SRC_DIR};${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>") + if (NOT BUILD_SHARED_LIBS) + TARGET_C_PROPERTIES (perf STATIC) + target_link_libraries (perf PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET}) + else () + TARGET_C_PROPERTIES (perf SHARED) + target_link_libraries (perf PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_TEST_LIBSH_TARGET} ${HDF5_LIBSH_TARGET}) + endif () + set_target_properties (perf PROPERTIES FOLDER perform) endif () - set_target_properties (perf PROPERTIES FOLDER perform) #-- Adding test for h5perf set (h5perf_SOURCES diff --git a/tools/test/perform/pio_standalone.c b/tools/test/perform/pio_standalone.c index dd6a61a..022e390 100644 --- a/tools/test/perform/pio_standalone.c +++ b/tools/test/perform/pio_standalone.c @@ -162,4 +162,8 @@ print_version(const char *progname) H5_VERS_SUBRELEASE[0] ? "-" : "", H5_VERS_SUBRELEASE); } +#ifdef H5_HAVE_PARALLEL +MPI_Info h5_io_info_g=MPI_INFO_NULL;/* MPI INFO object for IO */ +#endif + |