From 1d598182d6097052060f15a6b0d744c42a2fd80a Mon Sep 17 00:00:00 2001
From: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Date: Wed, 2 Feb 2022 13:45:59 -0600
Subject: Update doc with HDF5_ROOT usage. (#1414)

---
 config/cmake/HDF5_Examples.cmake.in   |  4 ++--
 release_docs/USING_CMake_Examples.txt |  7 +++----
 release_docs/USING_HDF5_CMake.txt     | 19 +++++++++++--------
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/config/cmake/HDF5_Examples.cmake.in b/config/cmake/HDF5_Examples.cmake.in
index db638fd..9ff9b6f 100644
--- a/config/cmake/HDF5_Examples.cmake.in
+++ b/config/cmake/HDF5_Examples.cmake.in
@@ -83,12 +83,12 @@ set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DSITE:STRING=${CTEST_SITE} -DBUILDN
 ###############################################################################################################
 if(WIN32)
   set(SITE_OS_NAME "Windows")
-  set(ENV{HDF5_DIR} "${INSTALLDIR}/share/cmake")
+  set(ENV{HDF5_ROOT} "${INSTALLDIR}")
   set(CTEST_BINARY_NAME ${CTEST_SOURCE_NAME}\\build)
   set(CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}\\${CTEST_SOURCE_NAME}")
   set(CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}\\${CTEST_BINARY_NAME}")
 else()
-  set(ENV{HDF5_DIR} "${INSTALLDIR}/share/cmake")
+  set(ENV{HDF5_ROOT} "${INSTALLDIR}")
   set(ENV{LD_LIBRARY_PATH} "${INSTALLDIR}/lib")
   set(CTEST_BINARY_NAME ${CTEST_SOURCE_NAME}/build)
   set(CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_SOURCE_NAME}")
diff --git a/release_docs/USING_CMake_Examples.txt b/release_docs/USING_CMake_Examples.txt
index a12a952..920705b 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.13.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 792c719..abe1906 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.13.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.13.x/cmake
+            HDF5_ROOT=C:/Program Files/HDF_Group/HDF5/1.13.x/
          On unix:
-            HDF5_DIR=<install root folder>/HDF_Group/HDF5/1.13.x/cmake
+            HDF5_ROOT=<install root folder>/HDF_Group/HDF5/1.13.x/
 
       If you are using shared libraries, you may need to add to the path
       environment variable. Set the path environment variable to the
-- 
cgit v0.12