summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <50328838+byrnHDF@users.noreply.github.com>2021-12-02 19:08:39 (GMT)
committerGitHub <noreply@github.com>2021-12-02 19:08:39 (GMT)
commit4ed560ed14e1ea6911904419377eeb6739e8746d (patch)
tree19517be990d57b4d2cb61ed4987dc20813987b53
parentdc39092ced51917c08caf17067b1a8efe17deeaa (diff)
downloadhdf5-4ed560ed14e1ea6911904419377eeb6739e8746d.zip
hdf5-4ed560ed14e1ea6911904419377eeb6739e8746d.tar.gz
hdf5-4ed560ed14e1ea6911904419377eeb6739e8746d.tar.bz2
Merge #1237 Add check for SDK version on windows (#1238)
-rw-r--r--tools/test/h5dump/CMakeTests.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/test/h5dump/CMakeTests.cmake b/tools/test/h5dump/CMakeTests.cmake
index a8984de..c0f279d 100644
--- a/tools/test/h5dump/CMakeTests.cmake
+++ b/tools/test/h5dump/CMakeTests.cmake
@@ -412,7 +412,7 @@
# --------------------------------------------------------------------
HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tbin1.ddl" "${PROJECT_BINARY_DIR}/testfiles/std/tbin1LE.ddl" "h5dump_std_files")
- if (WIN32)
+ if (WIN32 AND CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION VERSION_LESS 10.0.18362.0)
configure_file(${HDF5_TOOLS_DIR}/testfiles/tbinregR.exp ${PROJECT_BINARY_DIR}/testfiles/std/tbinregR.exp NEWLINE_STYLE CRLF)
#file (READ ${HDF5_TOOLS_DIR}/testfiles/tbinregR.exp TEST_STREAM)
#file (WRITE ${PROJECT_BINARY_DIR}/testfiles/std/tbinregR.exp "${TEST_STREAM}")