summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2020-09-04 21:48:58 (GMT)
committerLarry Knox <lrknox@hdfgroup.org>2020-09-04 21:48:58 (GMT)
commit0012a34e3a6de9ba8024bda6749d0995a1cc0c9c (patch)
tree1891e1a88f502d947cbf3dc9ae8aa2fdde8c085c
parent50a3cf82137ad11b5b010a4588c91030b608aaae (diff)
parent02f12f4602667c51909fdeda547b65ee71886bd3 (diff)
downloadhdf5-0012a34e3a6de9ba8024bda6749d0995a1cc0c9c.zip
hdf5-0012a34e3a6de9ba8024bda6749d0995a1cc0c9c.tar.gz
hdf5-0012a34e3a6de9ba8024bda6749d0995a1cc0c9c.tar.bz2
Merge pull request #2876 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '02f12f4602667c51909fdeda547b65ee71886bd3': 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@