summaryrefslogtreecommitdiffstats
path: root/tools/h5dump/CMakeTests.cmake
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2014-04-02 18:35:01 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2014-04-02 18:35:01 (GMT)
commit98bbf4a36a2410fe0862c739370365a160053f17 (patch)
treec07dd05d13fe3729d677ffe82be9d2a662035467 /tools/h5dump/CMakeTests.cmake
parent5555f057ae4203b469cc22c6fc9bf886ff809343 (diff)
downloadhdf5-98bbf4a36a2410fe0862c739370365a160053f17.zip
hdf5-98bbf4a36a2410fe0862c739370365a160053f17.tar.gz
hdf5-98bbf4a36a2410fe0862c739370365a160053f17.tar.bz2
[svn-r24948] Group tests by Common name
Remove WIN32 AND NOT CYGWIN if blocks - should be just WIN32 Tested: local linux CMake
Diffstat (limited to 'tools/h5dump/CMakeTests.cmake')
-rw-r--r--tools/h5dump/CMakeTests.cmake12
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/h5dump/CMakeTests.cmake b/tools/h5dump/CMakeTests.cmake
index bb2a37e..fb7022c 100644
--- a/tools/h5dump/CMakeTests.cmake
+++ b/tools/h5dump/CMakeTests.cmake
@@ -325,17 +325,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})
@@ -372,17 +372,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)
##############################################################################
##############################################################################