diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2011-02-21 19:58:09 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2011-02-21 19:58:09 (GMT) |
| commit | 78bce9b4b389b0f78d8200bc257a76dcb7380b49 (patch) | |
| tree | 18cc387afd8f0f37c334c17ca9e48e68d6c4d92b /tools/h5repack | |
| parent | 13edfb217585eee6fe9f9f20d0b3198c1bb5af98 (diff) | |
| download | hdf5-78bce9b4b389b0f78d8200bc257a76dcb7380b49.zip hdf5-78bce9b4b389b0f78d8200bc257a76dcb7380b49.tar.gz hdf5-78bce9b4b389b0f78d8200bc257a76dcb7380b49.tar.bz2 | |
[svn-r20128] Add fortran mod folder to INCLUDE_DIRS for gfortran 4.2.x.
Add test dependicies to correct the order of tests - cmake 2.8.4 bug - but also will improve cmake parallel testing.
Tested: local linux, jam
Diffstat (limited to 'tools/h5repack')
| -rw-r--r-- | tools/h5repack/CMakeLists.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/h5repack/CMakeLists.txt b/tools/h5repack/CMakeLists.txt index 76f3896..ae81d7b 100644 --- a/tools/h5repack/CMakeLists.txt +++ b/tools/h5repack/CMakeLists.txt @@ -59,6 +59,7 @@ IF (BUILD_TESTING) TARGET_LINK_LIBRARIES (h5repacktest ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET}) ADD_TEST (NAME h5repacktest COMMAND $<TARGET_FILE:h5repacktest>) + SET_TESTS_PROPERTIES (h5repacktest PROPERTIES DEPENDS testh5repack_detect_szip) IF (HDF5_TEST_VFD) @@ -176,10 +177,12 @@ IF (BUILD_TESTING) NAME H5REPACK-${testname} COMMAND $<TARGET_FILE:h5repack> ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out.${testfile} ) + SET_TESTS_PROPERTIES (H5REPACK-${testname} PROPERTIES DEPENDS H5REPACK-clearall-objects) ADD_TEST ( NAME H5REPACK-DIFF_${testname} COMMAND $<TARGET_FILE:h5diff> ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out.${testfile} ) + SET_TESTS_PROPERTIES (H5REPACK-DIFF_${testname} PROPERTIES DEPENDS H5REPACK-${testname}) ENDIF (${testtype} STREQUAL "SKIP") ENDMACRO (ADD_H5_TEST) @@ -225,6 +228,7 @@ IF (BUILD_TESTING) -D "TEST_REFERENCE=${testfilter}" -P "${HDF5_RESOURCES_DIR}/grepTest.cmake" ) + SET_TESTS_PROPERTIES (H5REPACK_VERIFY_LAYOUT-${testname} PROPERTIES DEPENDS H5REPACK-${testname}) ELSE (${resultcode} STREQUAL "0") IF (${testfilter} STREQUAL "CHUNKED") SET (nottestfilter "(CONTIGUOUS|COMPACT)") @@ -247,6 +251,7 @@ IF (BUILD_TESTING) -D "TEST_REFERENCE=${testfilter}" -P "${HDF5_RESOURCES_DIR}/grepTest.cmake" ) + SET_TESTS_PROPERTIES (H5REPACK_VERIFY_LAYOUT_ALL-${testname} PROPERTIES DEPENDS H5REPACK-${testname}) ENDIF (${resultcode} STREQUAL "0") ENDIF (${testtype} STREQUAL "SKIP") ENDMACRO (ADD_H5_VERIFY_TEST) |