diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2015-10-26 04:49:56 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2015-10-26 04:49:56 (GMT) |
| commit | 8a1ca95768c7f4017372419432d370468421a617 (patch) | |
| tree | f9ccb7bcadee95580ca5de43a0a4da3a04d84cba /tools | |
| parent | c07ff78058eae9daeac192b77ede730bce51d252 (diff) | |
| download | hdf5-8a1ca95768c7f4017372419432d370468421a617.zip hdf5-8a1ca95768c7f4017372419432d370468421a617.tar.gz hdf5-8a1ca95768c7f4017372419432d370468421a617.tar.bz2 | |
[svn-r28216] Merge of r27969:28132, 28144:28193 from trunk.
Mostly CMake changes, but there's also a few minor library
changes.
Temporarily commented out the accum test. The test builds
but one of the sub-tests fails due to a file issue.
Tested on: Ubuntu 15.04 (Linux 3.19 x86_64) gcc 4.9.2
serial w/autotools
serial w/CMake (3.3.2, w/ fortran and C++)
Diffstat (limited to 'tools')
| -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) ############################################################################## ############################################################################## |