From 2ad70782bea62091e25d64c39405b15d3dddef21 Mon Sep 17 00:00:00 2001
From: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Date: Sat, 12 Mar 2022 12:37:29 -0600
Subject: 1.10 Update HDF5_ROOT usage (#1487)

* Update HDF5_ROOT usage

* Fix typo
---
 config/cmake_ext_mod/HDFMacros.cmake |  2 +-
 release_docs/RELEASE.txt             | 11 ++++++++++-
 release_docs/USING_HDF5_CMake.txt    |  4 ++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/config/cmake_ext_mod/HDFMacros.cmake b/config/cmake_ext_mod/HDFMacros.cmake
index d25e97a..53e9f8f 100644
--- a/config/cmake_ext_mod/HDFMacros.cmake
+++ b/config/cmake_ext_mod/HDFMacros.cmake
@@ -356,7 +356,7 @@ macro (HDF_DIR_PATHS package_prefix)
     endif ()
   endif ()
   if (NOT ${package_prefix}_INSTALL_CMAKE_DIR)
-    set (${package_prefix}_INSTALL_CMAKE_DIR share/cmake)
+    set (${package_prefix}_INSTALL_CMAKE_DIR cmake)
   endif ()
 
   # Always use full RPATH, i.e. don't skip the full RPATH for the build tree
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 0566ba4..754026c 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -178,7 +178,16 @@ Bug Fixes since HDF5-1.10.7 release
 
     Configuration
     -------------
-    - 
+    - Reworked corrected path searched by CMake find_package command
+
+      The install path for cmake find_package files had been changed to use
+        "share/cmake"
+      for all platforms. However setting the HDF5_ROOT variable failed to locate
+      the configuration files. The build variable HDF5_INSTALL_CMAKE_DIR is now
+      set to the <INSTALL_DIR>/cmake folder. The location of the configuration 
+      files can still be specified by the "HDF5_DIR" variable.
+
+      (ADB - 2022/03/11)
 
 
     Tools
diff --git a/release_docs/USING_HDF5_CMake.txt b/release_docs/USING_HDF5_CMake.txt
index dc9c98a..44b88d4 100644
--- a/release_docs/USING_HDF5_CMake.txt
+++ b/release_docs/USING_HDF5_CMake.txt
@@ -50,9 +50,9 @@ I. Preconditions
       or environment variable, set(ENV{HDF5_ROOT} "<install_path>")
       to the installed location of HDF5.
          On Windows:
-            HDF5_ROOT=C:/Program Files/HDF_Group/HDF5/1.10.x/cmake
+            HDF5_ROOT=C:/Program Files/HDF_Group/HDF5/1.10.x/
          On unix:
-            HDF5_ROOT=<install root folder>/HDF_Group/HDF5/1.10.x/cmake
+            HDF5_ROOT=<install root folder>/HDF_Group/HDF5/1.10.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