summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorAllen Byrne <50328838+byrnHDF@users.noreply.github.com>2024-03-05 22:42:08 (GMT)
committerGitHub <noreply@github.com>2024-03-05 22:42:08 (GMT)
commit129d80d2082730d129d56cda1828c4bd74e8f09f (patch)
tree30d9b4e5c2bc5309e11ac1c7ae2a1f1c25c030b9 /config
parente4d9b639d5cb611a028791ef7186ca038ed5e9b8 (diff)
downloadhdf5-129d80d2082730d129d56cda1828c4bd74e8f09f.zip
hdf5-129d80d2082730d129d56cda1828c4bd74e8f09f.tar.gz
hdf5-129d80d2082730d129d56cda1828c4bd74e8f09f.tar.bz2
Update INSTALL files (#4052)
Diffstat (limited to 'config')
-rw-r--r--config/cmake/HDFMacros.cmake5
-rw-r--r--config/cmake/README.md.cmake.in22
2 files changed, 15 insertions, 12 deletions
diff --git a/config/cmake/HDFMacros.cmake b/config/cmake/HDFMacros.cmake
index 64e77c0..1533827 100644
--- a/config/cmake/HDFMacros.cmake
+++ b/config/cmake/HDFMacros.cmake
@@ -279,6 +279,7 @@ macro (HDF_README_PROPERTIES target_fortran)
if (WIN32)
set (BINARY_EXAMPLE_ENDING "zip")
set (BINARY_INSTALL_ENDING "msi")
+ set (BINARY_COMPRESS_ENDING "zip")
if (CMAKE_CL_64)
set (BINARY_SYSTEM_NAME "win64")
else ()
@@ -330,12 +331,14 @@ macro (HDF_README_PROPERTIES target_fortran)
endif ()
elseif (APPLE)
set (BINARY_EXAMPLE_ENDING "tar.gz")
+ set (BINARY_COMPRESS_ENDING "tar.gz")
set (BINARY_INSTALL_ENDING "sh") # if packaging changes - use dmg
set (BINARY_PLATFORM "${BINARY_PLATFORM} ${CMAKE_SYSTEM_VERSION} ${CMAKE_SYSTEM_PROCESSOR}")
set (BINARY_PLATFORM "${BINARY_PLATFORM}, using ${CMAKE_C_COMPILER_ID} C ${CMAKE_C_COMPILER_VERSION}")
else ()
set (BINARY_EXAMPLE_ENDING "tar.gz")
- set (BINARY_INSTALL_ENDING "sh")
+ set (BINARY_COMPRESS_ENDING "tar.gz")
+ set (BINARY_INSTALL_ENDING "sh/deb/rpm")
set (BINARY_PLATFORM "${BINARY_PLATFORM} ${CMAKE_SYSTEM_VERSION} ${CMAKE_SYSTEM_PROCESSOR}")
set (BINARY_PLATFORM "${BINARY_PLATFORM}, using ${CMAKE_C_COMPILER_ID} C ${CMAKE_C_COMPILER_VERSION}")
endif ()
diff --git a/config/cmake/README.md.cmake.in b/config/cmake/README.md.cmake.in
index d7e4bc4..5ba93f3 100644
--- a/config/cmake/README.md.cmake.in
+++ b/config/cmake/README.md.cmake.in
@@ -2,13 +2,13 @@
------------------------------------------------------------------------------
This directory contains the binary (release) distribution of
-@HDF5_PACKAGE_NAME@ @HDF5_PACKAGE_VERSION_MAJOR@ that was compiled on;
+@HDF5_PACKAGE_NAME@ @HDF5_PACKAGE_VERSION_MAJOR@.@HDF5_PACKAGE_VERSION_MINOR@ that was compiled on;
@BINARY_PLATFORM@.
It was built with the following options:
-- @LIB_TYPE@ C/C++/Fortran libraries
-- SZIP (encoder enabled) and ZLIB
- -- @LIB_TYPE@ HDF5 tools
+ -- HDF5 tools
-- Java @Java_VERSION@
The contents of this directory are:
@@ -16,17 +16,12 @@ The contents of this directory are:
COPYING - Copyright notice
README.md - This file
@HDF5_PACKAGE_NAME@-@HDF5_PACKAGE_VERSION@-@BINARY_SYSTEM_NAME@.@BINARY_INSTALL_ENDING@ - HDF5 Install Package
+ OR
+ @HDF5_PACKAGE_NAME@-@HDF5_PACKAGE_VERSION@-@BINARY_SYSTEM_NAME@.@BINARY_COMPRESS_ENDING@ - HDF5 Compressed 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://github.com/MathisRosenhauer/libaec
- https://github.com/MathisRosenhauer/libaec/blob/master/LICENSE.txt
+(Encoder ENABLED).
Installation
@@ -35,6 +30,11 @@ Installation
2. Follow prompts
===========================================================================
+Uncompress
+===========================================================================
+1. Extract @HDF5_PACKAGE_NAME@-@HDF5_PACKAGE_VERSION@-@BINARY_SYSTEM_NAME@.@BINARY_COMPRESS_ENDING@
+===========================================================================
+
After Installation
===========================================================================
The examples folder, HDF5Examples, located in the
@@ -75,6 +75,6 @@ For more information see USING_CMake_Examples.txt in the install folder.
===========================================================================
Documentation for this release can be found at the following URL:
- https://portal.hdfgroup.org/display/HDF5/HDF5
+ https://portal.hdfgroup.org/documentation/index.html#hdf5
Bugs should be reported to help@hdfgroup.org.