diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2015-10-21 21:36:36 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2015-10-21 21:36:36 (GMT) |
| commit | 3edabec156a2d87329e1bced861197b09e92f113 (patch) | |
| tree | def9b1f72cf1a54d743d37720ab4f1b76a690089 /tools/h5diff | |
| parent | aa4284b2a3ce1908f339bd07da0370c493d71b89 (diff) | |
| download | hdf5-3edabec156a2d87329e1bced861197b09e92f113.zip hdf5-3edabec156a2d87329e1bced861197b09e92f113.tar.gz hdf5-3edabec156a2d87329e1bced861197b09e92f113.tar.bz2 | |
[svn-r28176] HDFFV-9550: Add VS2015 fix for change of standard format.
Diffstat (limited to 'tools/h5diff')
| -rw-r--r-- | tools/h5diff/CMakeTests.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/h5diff/CMakeTests.cmake b/tools/h5diff/CMakeTests.cmake index 33d0971..0595edd 100644 --- a/tools/h5diff/CMakeTests.cmake +++ b/tools/h5diff/CMakeTests.cmake @@ -280,9 +280,9 @@ # - # Overwrite system dependent files (Windows) + # Overwrite system dependent files (Windows) and not VS2015 # - if (WIN32) + if (WIN32 AND MSVC_VERSION LESS 1900) add_custom_command ( TARGET h5diff POST_BUILD @@ -309,7 +309,7 @@ COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_104w.txt ${PROJECT_BINARY_DIR}/testfiles/h5diff_104.txt ) - endif (WIN32) + endif (WIN32 AND MSVC_VERSION LESS 1900) ############################################################################## ############################################################################## |