diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2010-08-31 20:15:13 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2010-08-31 20:15:13 (GMT) |
| commit | e65aa8c36566febd00da128e64cc90f3c8ffbc70 (patch) | |
| tree | 1c52c1ccdf6b28b73702da3b49bad78f5414b33c /testpar/CMakeLists.txt | |
| parent | b8d1216dcac1b773f9a7f757ee4dca67547dc082 (diff) | |
| download | hdf5-e65aa8c36566febd00da128e64cc90f3c8ffbc70.zip hdf5-e65aa8c36566febd00da128e64cc90f3c8ffbc70.tar.gz hdf5-e65aa8c36566febd00da128e64cc90f3c8ffbc70.tar.bz2 | |
[svn-r19325] Added parallel build commands.
Corrected use/name of source folder aliases.
Duplicated FindMPI.cmake so that non-c++ compiler is found first (recommemded commands did not work).
Tested: local linux with mpich
Diffstat (limited to 'testpar/CMakeLists.txt')
| -rw-r--r-- | testpar/CMakeLists.txt | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/testpar/CMakeLists.txt b/testpar/CMakeLists.txt index 0eac602..05e0ced 100644 --- a/testpar/CMakeLists.txt +++ b/testpar/CMakeLists.txt @@ -1,6 +1,8 @@ cmake_minimum_required (VERSION 2.8) -PROJECT (H5_TEST_PAR) +PROJECT (HDF5_TEST_PAR) +INCLUDE_DIRECTORIES (${HDF5_TEST_SRC_DIR}) +INCLUDE_DIRECTORIES (${HDF5_TOOLS_SRC_DIR}/lib ) #----------------------------------------------------------------------------- # Define Tests #----------------------------------------------------------------------------- @@ -15,6 +17,7 @@ SET (testphdf5_SRCS ${HDF5_TEST_PAR_SOURCE_DIR}/t_span_tree.c ${HDF5_TEST_PAR_SOURCE_DIR}/t_chunk_alloc.c ${HDF5_TEST_PAR_SOURCE_DIR}/t_filter_read.c + ${HDF5_TEST_PAR_SOURCE_DIR}/t_rank_projection.c ) #-- Adding test for testhdf5 @@ -32,7 +35,7 @@ IF (WIN32) ENDIF (WIN32) TARGET_LINK_LIBRARIES (testphdf5 ${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET}) -ADD_TEST (NAME testphdf5 COMMAND $<TARGET_FILE:testphdf5>) +ADD_TEST (NAME testphdf5 COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $<TARGET_FILE:testphdf5>) MACRO (ADD_H5P_TEST file) ADD_EXECUTABLE (${file} ${HDF5_TEST_PAR_SOURCE_DIR}/${file}.c) @@ -49,7 +52,7 @@ MACRO (ADD_H5P_TEST file) ENDIF (WIN32) TARGET_LINK_LIBRARIES (${file} ${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET}) - ADD_TEST (NAME ${file} COMMAND $<TARGET_FILE:${file}>) + ADD_TEST (NAME ${file} COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $<TARGET_FILE:${file}>) ENDMACRO (ADD_H5P_TEST file) SET (H5P_TESTS |