summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2020-09-04 21:48:38 (GMT)
committerLarry Knox <lrknox@hdfgroup.org>2020-09-04 21:48:38 (GMT)
commit7ea904933ccc494010bd9926f1f3fad8266a4bcc (patch)
treef422e3251922aa1ee52c56f2a0a60fdb09e29080
parent75bd8fe97dd416349bfd40a8af93a3a24bd677ee (diff)
parent94e15ff3e9d6e3cb7cf35fd8296e69a0f850aff5 (diff)
downloadhdf5-7ea904933ccc494010bd9926f1f3fad8266a4bcc.zip
hdf5-7ea904933ccc494010bd9926f1f3fad8266a4bcc.tar.gz
hdf5-7ea904933ccc494010bd9926f1f3fad8266a4bcc.tar.bz2
Merge pull request #2877 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:hdf5_1_10_7 to hdf5_1_10_7
* commit '94e15ff3e9d6e3cb7cf35fd8296e69a0f850aff5': Add zlib and szip pages Correct COPYING path
-rw-r--r--CMakeInstallation.cmake2
-rw-r--r--config/cmake/README.txt.cmake.in12
2 files changed, 13 insertions, 1 deletions
diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake
index c7a0691..c9eb229 100644
--- a/CMakeInstallation.cmake
+++ b/CMakeInstallation.cmake
@@ -274,7 +274,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@