diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2014-04-07 17:26:44 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2014-04-07 17:26:44 (GMT) |
commit | ab2d9f1e9c44502f6dfe69969974a99d2953159d (patch) | |
tree | 32d9a9298ab53b766baf1486704ca4ddd9b61d4b /tools/h5dump/CMakeTests.cmake | |
parent | fadc2d8c61c975cd6a64443ffbaa9ff6999a2419 (diff) | |
download | hdf5-ab2d9f1e9c44502f6dfe69969974a99d2953159d.zip hdf5-ab2d9f1e9c44502f6dfe69969974a99d2953159d.tar.gz hdf5-ab2d9f1e9c44502f6dfe69969974a99d2953159d.tar.bz2 |
[svn-r24980] HDFFV-8290: Merge automake 1.14.1 changes from trunk
Tested: h5committest
Diffstat (limited to 'tools/h5dump/CMakeTests.cmake')
-rw-r--r-- | tools/h5dump/CMakeTests.cmake | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/h5dump/CMakeTests.cmake b/tools/h5dump/CMakeTests.cmake index 319d526..c42882a 100644 --- a/tools/h5dump/CMakeTests.cmake +++ b/tools/h5dump/CMakeTests.cmake @@ -323,17 +323,17 @@ endforeach (tst_h5_file ${HDF5_REFERENCE_TEST_FILES}) foreach (tst_exp_file ${HDF5_REFERENCE_EXP_FILES}) - if (WIN32 AND NOT CYGWIN) + if (WIN32) file (READ ${HDF5_TOOLS_SRC_DIR}/testfiles/${tst_exp_file} TEST_STREAM) file (WRITE ${PROJECT_BINARY_DIR}/testfiles/std/${tst_exp_file} "${TEST_STREAM}") - else (WIN32 AND NOT CYGWIN) + else (WIN32) add_custom_command ( TARGET h5dump POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${HDF5_TOOLS_SRC_DIR}/testfiles/${tst_exp_file} ${PROJECT_BINARY_DIR}/testfiles/std/${tst_exp_file} ) - endif (WIN32 AND NOT CYGWIN) + endif (WIN32) endforeach (tst_exp_file ${HDF5_REFERENCE_EXP_FILES}) foreach (tst_other_file ${HDF5_REFERENCE_FILES}) @@ -370,17 +370,17 @@ ARGS -E copy_if_different ${HDF5_TOOLS_SOURCE_DIR}/testfiles/tbin1.ddl ${PROJECT_BINARY_DIR}/testfiles/std/tbin1LE.ddl ) - if (WIN32 AND NOT CYGWIN) + if (WIN32) file (READ ${HDF5_TOOLS_SRC_DIR}/testfiles/tbinregR.exp TEST_STREAM) file (WRITE ${PROJECT_BINARY_DIR}/testfiles/std/tbinregR.exp "${TEST_STREAM}") - else (WIN32 AND NOT CYGWIN) + else (WIN32) add_custom_command ( TARGET h5dump POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${HDF5_TOOLS_SRC_DIR}/testfiles/tbinregR.exp ${PROJECT_BINARY_DIR}/testfiles/std/tbinregR.exp ) - endif (WIN32 AND NOT CYGWIN) + endif (WIN32) ############################################################################## ############################################################################## |