diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-11-05 19:03:06 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-11-05 19:03:06 (GMT) |
| commit | 26b328aec8e10b9101c76bc049b6b5045b5f00a5 (patch) | |
| tree | 3d5cb4707febc7d52fe0d325fa06b143bfc68820 /tools/h5diff/CMakeTests.cmake | |
| parent | eb13dc7ec9281a9206f6e0a2a54151adf2ddecd3 (diff) | |
| parent | 401f0c181ea8e9f486203a6b70710f0631a4a640 (diff) | |
| download | hdf5-26b328aec8e10b9101c76bc049b6b5045b5f00a5.zip hdf5-26b328aec8e10b9101c76bc049b6b5045b5f00a5.tar.gz hdf5-26b328aec8e10b9101c76bc049b6b5045b5f00a5.tar.bz2 | |
[svn-r28288] merge from trunk.
Diffstat (limited to 'tools/h5diff/CMakeTests.cmake')
| -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) ############################################################################## ############################################################################## |