diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2010-08-11 16:48:38 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2010-08-11 16:48:38 (GMT) |
| commit | 051cf48d0bab6990fa27301cb43355f2a251d503 (patch) | |
| tree | f811c76b22f97838e6f6270704daeb0beb26c3b5 /tools | |
| parent | e4925d1512c4edef1eb161fc0ea90482e6098cd6 (diff) | |
| download | hdf5-051cf48d0bab6990fa27301cb43355f2a251d503.zip hdf5-051cf48d0bab6990fa27301cb43355f2a251d503.tar.gz hdf5-051cf48d0bab6990fa27301cb43355f2a251d503.tar.bz2 | |
[svn-r19226] File read/write happens at configure time, so moved windows specific copy from test macro to where the expected file is copied.
Tested: windows
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/h5dump/CMakeLists.txt | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/tools/h5dump/CMakeLists.txt b/tools/h5dump/CMakeLists.txt index 2162d53..00ff759 100644 --- a/tools/h5dump/CMakeLists.txt +++ b/tools/h5dump/CMakeLists.txt @@ -312,12 +312,17 @@ IF (BUILD_TESTING) ARGS -E copy_if_different ${HDF5_TOOLS_SOURCE_DIR}/testfiles/tbin1.ddl ${PROJECT_BINARY_DIR}/tbin1LE.ddl ) - ADD_CUSTOM_COMMAND ( - TARGET h5dump - POST_BUILD - COMMAND ${CMAKE_COMMAND} - ARGS -E copy_if_different ${HDF5_TOOLS_SOURCE_DIR}/testfiles/tbinregR.exp ${PROJECT_BINARY_DIR}/tbinregR.exp - ) + IF (WIN32 AND NOT MINGW) + FILE (READ ${HDF5_TOOLS_SOURCE_DIR}/testfiles/tbinregR.exp TEST_STREAM) + FILE (WRITE ${PROJECT_BINARY_DIR}/tbinregR.exp "${TEST_STREAM}") + ELSE (WIN32 AND NOT MINGW) + ADD_CUSTOM_COMMAND ( + TARGET h5dump + POST_BUILD + COMMAND ${CMAKE_COMMAND} + ARGS -E copy_if_different ${HDF5_TOOLS_SOURCE_DIR}/testfiles/tbinregR.exp ${PROJECT_BINARY_DIR}/tbinregR.exp + ) + ENDIF (WIN32 AND NOT MINGW) MACRO (ADD_SKIP_H5_TEST skipresultfile skipresultcode testtype) IF (${testtype} STREQUAL "SKIP") @@ -346,10 +351,6 @@ IF (BUILD_TESTING) NAME H5DUMP-output-${resultfile} COMMAND $<TARGET_FILE:h5dump> -d /Dataset1 -s 0 -R -y -o ${PROJECT_BINARY_DIR}/${resultfile}.txt ${PROJECT_BINARY_DIR}/${targetfile} ) - IF (WIN32 AND NOT MINGW) - FILE (READ ${PROJECT_BINARY_DIR}/${resultfile}.exp TEST_STREAM) - FILE (WRITE ${PROJECT_BINARY_DIR}/${resultfile}.exp "${TEST_STREAM}") - ENDIF (WIN32 AND NOT MINGW) ADD_TEST ( NAME H5DUMP-output-cmp-${resultfile} COMMAND ${CMAKE_COMMAND} |