summaryrefslogtreecommitdiffstats
path: root/release_docs
diff options
context:
space:
mode:
authorAllen Byrne <50328838+byrnHDF@users.noreply.github.com>2022-02-27 01:08:00 (GMT)
committerGitHub <noreply@github.com>2022-02-27 01:08:00 (GMT)
commit50291e54d7ff62e6a6679a63234bb2b1203cd0dc (patch)
treeaec39901baa799e49f108cc80e602f3ef0e76293 /release_docs
parente8b030363999befa548b94ac5c505d170540aebc (diff)
downloadhdf5-50291e54d7ff62e6a6679a63234bb2b1203cd0dc.zip
hdf5-50291e54d7ff62e6a6679a63234bb2b1203cd0dc.tar.gz
hdf5-50291e54d7ff62e6a6679a63234bb2b1203cd0dc.tar.bz2
Merge SZ plugin changes from develop (#1456)
Diffstat (limited to 'release_docs')
-rw-r--r--release_docs/README_HDF5_CMake2
-rw-r--r--release_docs/USING_CMake_Examples.txt7
-rw-r--r--release_docs/USING_HDF5_CMake.txt19
3 files changed, 15 insertions, 13 deletions
diff --git a/release_docs/README_HDF5_CMake b/release_docs/README_HDF5_CMake
index 3f30aaa..d25f3f4 100644
--- a/release_docs/README_HDF5_CMake
+++ b/release_docs/README_HDF5_CMake
@@ -10,7 +10,7 @@ This tar file contains
LIBAEC.tar.gz source for building SZIP replacement
ZLib.tar.gz source for building ZLIB
hdf5_plugins.tar.gz source for building compression plugins
- HDF5Examples-1.10.17-Source.tar.gz source for building examples
+ HDF5Examples-1.10.18-Source.tar.gz source for building examples
For more information about building HDF5 with CMake, see USING_HDF5_CMake.txt in
hdf5-1.10.8/release_docs, or
diff --git a/release_docs/USING_CMake_Examples.txt b/release_docs/USING_CMake_Examples.txt
index de9e135..24def07 100644
--- a/release_docs/USING_CMake_Examples.txt
+++ b/release_docs/USING_CMake_Examples.txt
@@ -20,15 +20,14 @@ Notes: This short instruction is written for users who want to quickly
I. Preconditions
========================================================================
- 1. We suggest you obtain the latest CMake for windows from the Kitware
+ 1. We suggest you obtain the latest CMake for your platform from the Kitware
web site. The HDF5 1.10.x product requires a minimum CMake version
of 3.12. If you are using VS2019, the minimum version is 3.15.
2. You have installed the HDF5 library built with CMake, by executing
the HDF Install Utility (the *.msi file in the binary package for
- Windows or the *.sh on Linux). If you are using a Windows platform,
- you can obtain a pre-built Windows binary from The HDF Group's website
- at www.hdfgroup.org.
+ Windows or the *.sh on Linux). You can obtain pre-built binaries
+ from The HDF Group's website at www.hdfgroup.org.
diff --git a/release_docs/USING_HDF5_CMake.txt b/release_docs/USING_HDF5_CMake.txt
index e6d00de..dc9c98a 100644
--- a/release_docs/USING_HDF5_CMake.txt
+++ b/release_docs/USING_HDF5_CMake.txt
@@ -29,27 +29,30 @@ Notes: This short instruction is written for users who want to quickly
of using a ctest script for building and testing. See
INSTALL_CMake.txt for more information.
+ 4. See https://cmake.org/cmake/help/latest/command/find_package.html
+ for more information on the CMake "Config Mode Search Procedure".
========================================================================
I. Preconditions
========================================================================
- 1. We suggest you obtain the latest CMake for windows from the Kitware
+ 1. We suggest you obtain the latest CMake for your platform from the Kitware
web site. The HDF5 1.10.x product requires a minimum CMake version
- of 3.12.
+ of 3.12. If you are using VS2019, the minimum version is 3.15.
2. You have installed the HDF5 library built with CMake, by executing
the HDF Install Utility (the *.msi file in the binary package for
- Windows). You can obtain pre-built binaries from The HDF Group's website at
- www.hdfgroup.org.
+ Windows or the *.sh on Linux). You can obtain pre-built binaries
+ from The HDF Group's website at www.hdfgroup.org.
- 3. Set the environment variable HDF5_DIR to the installed location of
- the config files for HDF5.
+ 3. Set the HDF5_ROOT CMake variable, -DHDF5_ROOT=<install_path>
+ or environment variable, set(ENV{HDF5_ROOT} "<install_path>")
+ to the installed location of HDF5.
On Windows:
- HDF5_DIR=C:/Program Files/HDF_Group/HDF5/1.10.x/cmake
+ HDF5_ROOT=C:/Program Files/HDF_Group/HDF5/1.10.x/cmake
On unix:
- HDF5_DIR=<install root folder>/HDF_Group/HDF5/1.10.x/cmake
+ HDF5_ROOT=<install root folder>/HDF_Group/HDF5/1.10.x/cmake
If you are using shared libraries, you may need to add to the path
environment variable. Set the path environment variable to the