diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2017-07-13 18:37:12 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2017-07-13 18:37:12 (GMT) |
| commit | 26390d02df919476ff3d293293dacbcaba9a4c24 (patch) | |
| tree | 7c61305306dded8636884fdfdfd00e5c134f66f0 | |
| parent | 516f0e3661d305419a817f44b3fdaf0337a548c3 (diff) | |
| parent | b3a212e54b86e15ea059d856db8685f43cc00829 (diff) | |
| download | hdf5-26390d02df919476ff3d293293dacbcaba9a4c24.zip hdf5-26390d02df919476ff3d293293dacbcaba9a4c24.tar.gz hdf5-26390d02df919476ff3d293293dacbcaba9a4c24.tar.bz2 | |
Merge pull request #601 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'b3a212e54b86e15ea059d856db8685f43cc00829':
HDFFV-10254 Fix spelling
HDFFV-10254 release note
HDFF-10254 - Copy test files with macro to avoid POST_BUILD failure
| -rw-r--r-- | hl/tools/h5watch/CMakeTests.cmake | 11 | ||||
| -rw-r--r-- | release_docs/RELEASE.txt | 12 |
2 files changed, 12 insertions, 11 deletions
diff --git a/hl/tools/h5watch/CMakeTests.cmake b/hl/tools/h5watch/CMakeTests.cmake index 35e7829..0b7b4d4 100644 --- a/hl/tools/h5watch/CMakeTests.cmake +++ b/hl/tools/h5watch/CMakeTests.cmake @@ -56,18 +56,11 @@ set (H5WATCH_TEST_FILES # make test dir file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles") -add_custom_target(h5watch-files ALL COMMENT "Copying files needed by h5watch tests") foreach (h5watch_file ${H5WATCH_TEST_FILES}) - set (dest "${PROJECT_BINARY_DIR}/testfiles/${h5watch_file}") - #message (STATUS " Copying ${h5watch_file}") - add_custom_command ( - TARGET h5watch-files - POST_BUILD - COMMAND ${CMAKE_COMMAND} - ARGS -E copy_if_different ${HDF5_HL_TOOLS_DIR}/testfiles/${h5watch_file} ${dest} - ) + HDFTEST_COPY_FILE("${HDF5_HL_TOOLS_DIR}/testfiles/${h5watch_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5watch_file}" "H5WATCH_files") endforeach () +add_custom_target(H5WATCH_files ALL COMMENT "Copying files needed by H5WATCH tests" DEPENDS ${H5WATCH_files_list}) ############################################################################## ############################################################################## diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index 4335b37..7eb70e1 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -127,7 +127,15 @@ Bug Fixes since HDF5-1.10.1 release Configuration ------------- - - + - cmake + + Too many commands for POST_BUILD step caused command line to be + too big on windows. + + Changed foreach of copy command to use a custom command with the + use of the HDFTEST_COPY_FILE macro. + + (ADB - 2017/07/12, HDFFV-10254) Performance ------------- @@ -149,7 +157,7 @@ Bug Fixes since HDF5-1.10.1 release The import from h5dump function expects the binary files to use native types (FILE '-b' option) in the binary file. - (ADB - 2017/06/15, HDFFV-102191) + (ADB - 2017/06/15, HDFFV-10219) - h5repack |