diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-03-28 20:06:04 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-03-28 20:06:04 (GMT) |
| commit | 96ec08a36c80b3abce7d9ce0e13ddbc39908df5f (patch) | |
| tree | 8deb658c10649caaac07ad4daf0d8aeba9a30c76 | |
| parent | 32c524f0f05dd5338c05690c333759119d7a5329 (diff) | |
| parent | adfffd04b1fa01fa4e1e78c489dfb8c2c3d30ce6 (diff) | |
| download | hdf5-96ec08a36c80b3abce7d9ce0e13ddbc39908df5f.zip hdf5-96ec08a36c80b3abce7d9ce0e13ddbc39908df5f.tar.gz hdf5-96ec08a36c80b3abce7d9ce0e13ddbc39908df5f.tar.bz2 | |
Merge pull request #1001 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'adfffd04b1fa01fa4e1e78c489dfb8c2c3d30ce6':
Correct name of h5 hl compile script
Add missing test file
| -rw-r--r-- | hl/src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tools/test/h5stat/CMakeTests.cmake | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/hl/src/CMakeLists.txt b/hl/src/CMakeLists.txt index 0daa86e..8ee775b 100644 --- a/hl/src/CMakeLists.txt +++ b/hl/src/CMakeLists.txt @@ -124,11 +124,11 @@ if (NOT WIN32) set (_PKG_CONFIG_COMPILER ${CMAKE_C_COMPILER}) configure_file ( ${HDF_RESOURCES_DIR}/libh5cc.in - ${HDF5_BINARY_DIR}/CMakeFiles/h5chl + ${HDF5_BINARY_DIR}/CMakeFiles/h5hlcc @ONLY ) install ( - FILES ${HDF5_BINARY_DIR}/CMakeFiles/h5chl + FILES ${HDF5_BINARY_DIR}/CMakeFiles/h5hlcc DESTINATION ${HDF5_INSTALL_BIN_DIR} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE COMPONENT hllibraries diff --git a/tools/test/h5stat/CMakeTests.cmake b/tools/test/h5stat/CMakeTests.cmake index 4811c61..69bab20 100644 --- a/tools/test/h5stat/CMakeTests.cmake +++ b/tools/test/h5stat/CMakeTests.cmake @@ -37,6 +37,7 @@ h5stat_newgrat-UG h5stat_newgrat-UA h5stat_err1_links + h5stat_idx h5stat_links1 h5stat_links2 h5stat_links3 @@ -54,6 +55,7 @@ ) set (HDF5_REFERENCE_TEST_FILES h5stat_filters.h5 + h5stat_idx.h5 h5stat_tsohm.h5 h5stat_newgrat.h5 h5stat_threshold.h5 |