diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2020-09-04 21:49:14 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2020-09-04 21:49:14 (GMT) |
| commit | 21b9b4eee9e1af16565891c3adac4acbf3aa842d (patch) | |
| tree | cd8467a478c7a832ab8c6fad08c06eaa3bc017be | |
| parent | cee201a2ea604281694f83c68bdfae41e4505fe6 (diff) | |
| parent | f838fcbe6709c4a6780fe4874709d42d1d6e3bb9 (diff) | |
| download | hdf5-21b9b4eee9e1af16565891c3adac4acbf3aa842d.zip hdf5-21b9b4eee9e1af16565891c3adac4acbf3aa842d.tar.gz hdf5-21b9b4eee9e1af16565891c3adac4acbf3aa842d.tar.bz2 | |
Merge pull request #2875 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_12 to hdf5_1_12
* commit 'f838fcbe6709c4a6780fe4874709d42d1d6e3bb9':
Add zlib and szip pages
Correct COPYING path
| -rw-r--r-- | CMakeInstallation.cmake | 2 | ||||
| -rw-r--r-- | config/cmake/README.txt.cmake.in | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake index 94d3139..a3b9632 100644 --- a/CMakeInstallation.cmake +++ b/CMakeInstallation.cmake @@ -278,7 +278,7 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES) set (CPACK_PACKAGE_VERSION_PATCH "") if (EXISTS "${HDF5_SOURCE_DIR}/release_docs") set (CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/release_docs/RELEASE.txt") - set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/release_docs/COPYING") + set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING") set (CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/release_docs/RELEASE.txt") endif () set (CPACK_PACKAGE_RELOCATABLE TRUE) diff --git a/config/cmake/README.txt.cmake.in b/config/cmake/README.txt.cmake.in index 3afebc2..f621515 100644 --- a/config/cmake/README.txt.cmake.in +++ b/config/cmake/README.txt.cmake.in @@ -17,6 +17,18 @@ The contents of this directory are: README.txt - This file @HDF5_PACKAGE_NAME@-@HDF5_PACKAGE_VERSION@-@BINARY_SYSTEM_NAME@.@BINARY_INSTALL_ENDING@ - HDF5 Install Package +This binary was built with the ZLIB and SZIP/Libaec external libraries and are +included for convenience. Libaec is an unrestricted open-source replacement for SZIP +(version 1.0.4, Encoder ENABLED). + +The official ZLIB and SZIP/Libaec pages are at: + + ZLIB: https://git.savannah.gnu.org/cgit/gzip.git/ + https://git.savannah.gnu.org/cgit/gzip.git/tree/COPYING + SZIP/Libaec: https://gitlab.dkrz.de/k202009/libaec + https://gitlab.dkrz.de/k202009/libaec/-/blob/master/Copyright.txt + + Installation =========================================================================== 1. Execute @HDF5_PACKAGE_NAME@-@HDF5_PACKAGE_VERSION@-@BINARY_SYSTEM_NAME@.@BINARY_INSTALL_ENDING@ |