Gather latest CMake changes from develop (#2609)

Add HDF5_SRC_INCLUDE_DIRS variable
cleanup cmake comments and documentation

2 files changed, 16 insertions, 12 deletions

diff --git a/release_docs/README_HPC b/release_docs/README_HPC
index a44a461..4aa3e84 100644
--- a/release_docs/README_HPC
+++ b/release_docs/README_HPC
@@ -39,6 +39,9 @@ If no branch is specified, then the 'develop' version will be checked out.
 If no source directory is specified, then the source will be located in the
 'hdf5' directory. The CMake scripts expect the source to be in a directory
 named hdf5-<version string>, where 'version string' uses the format '1.xx.xx'.
+For example, for the current 'develop' version, the "hdf5" directory should
+be renamed "hdf5-1.13.0", or for the first hdf5_1_12_0 pre-release version,
+it should be renamed "hdf5-1.12.0-5".
 
 If the version number is not known a priori, the version string
 can be obtained by running bin/h5vers in the top level directory of the source clone, and
@@ -62,14 +65,15 @@ scripts on compute nodes and to cross-compile for compute node hardware using
 a cross-compiling emulator.  The setup steps will make default settings for
 parallel or serial only builds available to the CMake command.
 
-    1. The "hdf5" directory should be renamed hdf5-<version string> (see section II).
+    1. For the current 'develop' version the "hdf5" directory should be renamed
+       "hdf5-1.13.0".
 
     2. Three cmake script files need to be copied to the working directory, or
        have symbolic links to them, created in the working directory:
 
-       hdf5-<version string>/config/cmake/scripts/HDF5config.cmake
-       hdf5-<version string>/config/cmake/scripts/CTestScript.cmake
-       hdf5-<version string>/config/cmake/scripts/HDF5options.cmake
+       hdf5-1.13.0/config/cmake/scripts/HDF5config.cmake
+       hdf5-1.13.0/config/cmake/scripts/CTestScript.cmake
+       hdf5-1.13.0/config/cmake/scripts/HDF5options.cmake
 
        should be copied to the working directory.
 
@@ -78,7 +82,7 @@ parallel or serial only builds available to the CMake command.
        CTestScript.cmake
        HDF5config.cmake
        HDF5options.cmake
-       hdf5-<version string>
+       hdf5-1.13.0
 
        Additionally, when the ctest command runs [1], it will add a build directory
        in the working directory.
@@ -141,7 +145,7 @@ cori, another CrayXC40, that line is replaced by "#SBATCH -C knl,quad,cache".
 For cori (and other machines), the values in LOCAL_BATCH_SCRIPT_NAME and
 LOCAL_BATCH_SCRIPT_PARALLEL_NAME in the config/cmake/scripts/HPC/sbatch-HDF5options.cmake
 file can be replaced by cori_knl_ctestS.sl and cori_knl_ctestS.sl, or the lines
-can be edited in the batch files in hdf5-<version string(see section II)>/bin/batch.
+can be edited in the batch files in hdf5-1.13.0/bin/batch.
 
 ========================================================================
 V. Manual alternatives
@@ -149,11 +153,11 @@ V. Manual alternatives
 If using ctest is undesirable, one can create a build directory and run the cmake
 configure command, for example
 
-"/projects/Mutrino/hpcsoft/cle6.0/common/cmake/<CMake version>/bin/cmake"
--C "<working directory>/hdf5-<version string>/config/cmake/cacheinit.cmake"
+"/projects/Mutrino/hpcsoft/cle6.0/common/cmake/3.12/bin/cmake"
+-C "<working directory>/hdf5-1.10.x/config/cmake/cacheinit.cmake"
 -DCMAKE_BUILD_TYPE:STRING=Release -DHDF5_BUILD_FORTRAN:BOOL=ON
 -DHDF5_BUILD_JAVA:BOOL=OFF
--DCMAKE_INSTALL_PREFIX:PATH=<working directory>/HDF_Group/HDF5/<version string>
+-DCMAKE_INSTALL_PREFIX:PATH=<working directory>/HDF_Group/HDF5/1.10.x
 -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=OFF -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF
 -DHDF5_ENABLE_PARALLEL:BOOL=ON -DHDF5_BUILD_CPP_LIB:BOOL=OFF
 -DHDF5_BUILD_JAVA:BOOL=OFF -DHDF5_ENABLE_THREADSAFE:BOOL=OFF
@@ -164,7 +168,7 @@ configure command, for example
 -DLOCAL_BATCH_SCRIPT_NAME:STRING=knl_ctestS.sl
 -DLOCAL_BATCH_SCRIPT_PARALLEL_NAME:STRING=knl_ctestP.sl -DSITE:STRING=mutrino
 -DBUILDNAME:STRING=par-knl_GCC493-SHARED-Linux-4.4.156-94.61.1.16335.0.PTF.1107299-default-x86_64
-"-GUnix Makefiles" "" "<working directory>/hdf5-<version string>"
+"-GUnix Makefiles" "" "<working directory>/hdf5-1.10.x"
 
 followed by make and batch jobs to run tests.
 
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 9263a63..1beee82 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -21,7 +21,7 @@ The official HDF5 releases can be obtained from:
 
      https://www.hdfgroup.org/downloads/hdf5/
 
-Changes from Release to Release and New Features in the HDF5-1.10.x release series
+Changes from release to release and new features in the HDF5-1.10.x release series
 can be found at:
 
      https://portal.hdfgroup.org/display/HDF5/HDF5+Application+Developer%27s+Guide
@@ -72,7 +72,7 @@ New Features
       (DER - 2023/03/17)
 
     - Added new option to build libaec and zlib inline with CMake.
-      
+
       Using the CMake FetchContent module, the external filters can populate
       content at configure time via any method supported by the ExternalProject
       module. Whereas ExternalProject_Add() downloads at build time, the