Merge CMake and tools changes from develop

6 files changed, 184 insertions, 170 deletions

diff --git a/release_docs/INSTALL_Cygwin.txt b/release_docs/INSTALL_Cygwin.txt
index 74f494c..e28b633 100644
--- a/release_docs/INSTALL_Cygwin.txt
+++ b/release_docs/INSTALL_Cygwin.txt
@@ -2,8 +2,8 @@
          HDF5 Build and Install Instructions for Cygwin
 ************************************************************************
 
-This document is a instruction on how to build, test and install HDF5 libary on 
-Cygwin.  See detailed information in hdf5/INSTALL. 
+This document is a instruction on how to build, test and install HDF5 libary on
+Cygwin.  See detailed information in hdf5/INSTALL.
 
 NOTE: hdf5 can be built with CMake, see the INSTALL_CMake.txt file for more guidance.
 
@@ -12,16 +12,16 @@ Preconditions:
 
 1. Installed Cygwin 1.7.25 or higher
 
-   To install the Cygwin net release, go to http://www.cygwin.com and 
+   To install the Cygwin net release, go to http://www.cygwin.com and
    click on "setup-x86.exe" (32-bit installation) under the heading
-    "Current Cygwin DLL version". This will download a GUI 
-   installer called setup-x86.exe which can be run to download a complete 
-   Cygwin installation via the internet. Then follow the instructions 
+    "Current Cygwin DLL version". This will download a GUI
+   installer called setup-x86.exe which can be run to download a complete
+   Cygwin installation via the internet. Then follow the instructions
    on each screen to install Cygwin.
 
-   Cygwin uses packages to manage installing various software. Users can 
+   Cygwin uses packages to manage installing various software. Users can
    choose to install or uninstall certain packages by running setup.exe.
-   http://www.cygwin.com/packages/ provides detailed information about 
+   http://www.cygwin.com/packages/ provides detailed information about
    Cygwin packages.
 
    Most required dependencies can be satisfied by installing all packages in
@@ -31,32 +31,32 @@ Preconditions:
 2. Compilers, Libraries and Utilities Installed
 
    2.1 Compilers Supported
-    
+
     The following compilers are supported by HDF5 and included in the Cygwin
     package system:
        gcc (4.7.3 and 4.9.2), which includes:
             gcc4-core    : C compiler
             gcc4-g++     : C++ compiler
             gcc4-fortran : fortran compiler
-            
+
 
    2.1.1 Using Compilers Not Supported
-       
+
        By default the current configuration uses vendor compilers; to use
         another compiler run the following commands before running
-        configure: 
- 
+        configure:
+
         setenv CC   "foo -flags"
         setenv FC  "fffoo -flags"
 
-       For example, if users want to use pgf90 as fortran compiler, then 
+       For example, if users want to use pgf90 as fortran compiler, then
 
             setenv FC pgf90
 
         See the configure help page (configure --help) for a list of
         environment variables that have an affect on building the
         library.
-        
+
     2.2 HDF5 External Library Dependencies
 
     2.2.1 Zlib
@@ -66,38 +66,38 @@ Preconditions:
     2.2.2 Szip
        The HDF5 library has a predefined compression filter that uses
        the extended-Rice lossless compression algorithm for chunked
-       datatsets. For more information on Szip compression, license terms, 
+       datatsets. For more information on Szip compression, license terms,
        and obtaining the Szip source code, see:
 
           https://portal.hdfgroup.org/display/HDF5/Szip+Compression+in+HDF+Products
-      
-    
+
+
     2.3 Additional Utilities
-    
+
     The following standard utilities are also required to build and test HDF5:
-        
+
         bison           : yacc implementation
         flex            : flex utility
         make            : make utility
-    
+
     2.4 Alternate Build Process
-    
-    Download the CMake package and follow the notes in the "INSTALL_CMake.txt" 
+
+    Download the CMake package and follow the notes in the "INSTALL_CMake.txt"
     file to build HDF5 with the CMake utilities.
-        
-        
-        
+
+
+
 Build, Test and Install HDF5 on Cygwin
 --------------------------------------
 
 1. Get HDF5 source code package
    Users can download HDF5 source code package from HDF website
-   (http://hdfgroup.org). 
-     
+   (http://hdfgroup.org).
+
 2. Unpacking the distribution
 
    The HDF5 source code is distributed in a variety of formats which
-   can be unpacked with the following commands, each of which creates 
+   can be unpacked with the following commands, each of which creates
    an `hdf5-1.10.x' directory.
 
    2.1 Non-compressed tar archive (*.tar)
@@ -110,118 +110,118 @@ Build, Test and Install HDF5 on Cygwin
 
    2.3 Bzip'd tar archive (*.tar.bz2)
 
-            $ bunzip2 < hdf5-1.10.x.tar.bz2 | tar xf - 
+            $ bunzip2 < hdf5-1.10.x.tar.bz2 | tar xf -
 
 2. Setup Environment
 
     In Cygwin, most compilers and setting are automatically detected during
-    the configure script.  However, if you are building Fortran we recommend 
-    that you explicitly set the "FC" variable in your environment to use the 
+    the configure script.  However, if you are building Fortran we recommend
+    that you explicitly set the "FC" variable in your environment to use the
     gfortran compiler.  For example, issue the command:
-    
+
             $ export FC=gfortran
-            
-4. Configuring 
-     
-   Notes: See detailed information in hdf5/release_docs/INSTALL, 
-          part 5. Full installation instructions for source 
+
+4. Configuring
+
+   Notes: See detailed information in hdf5/release_docs/INSTALL,
+          part 5. Full installation instructions for source
           distributions
 
-   The host configuration file for cygwin i686-pc-cygwin is located 
-   in the `config' directory and are based on architecture name, 
-   vendor name, and operating system which are displayed near the 
+   The host configuration file for cygwin i686-pc-cygwin is located
+   in the `config' directory and are based on architecture name,
+   vendor name, and operating system which are displayed near the
    beginning of the `configure' output. The host config file influences
-   the behavior of configure by setting or augmenting shell variables. 
-     
+   the behavior of configure by setting or augmenting shell variables.
+
    In short,
-     
-   To configure HDF5 C Library, using 
-            
+
+   To configure HDF5 C Library, using
+
             $ ./configure
-                   
+
    To configure HDF5 C/C++ Library, using
 
             $ ./configure --enable-cxx
-                   
+
    To configure HDF5 C/Fortran Library, using
 
             $ ./configure --enable-fortran
-                   
+
    To configure HDF5 C with Szip library, using
 
             $ ./configure  --with-szlib="path to szlib"
-           
-       For example, if szip library was installed in the directory 
+
+       For example, if szip library was installed in the directory
        /cygdrive/c/szip, which is parent directory of "include" and
-       "lib", then the following command will configure HDF5 C library 
+       "lib", then the following command will configure HDF5 C library
        with szip enabled:
-           
+
             $ ./configure --with-szlib=/cygdrive/c/szip
-                   
+
    To configure HDF5 C without Zlib,
-     
+
        To disable zlib, using
 
            $ ./configure --without-zlib
-           
+
    Two ways to configure HDF5 C with specified Zlib
-     
+
       Using
 
            $ ./configure --with-zlib=INCDIR,LIBDIR
 
        For example, if the zlib library is installed in
        /cygdrive/c/usr, which is the parent directory of directories
-       "include" and "lib", 
+       "include" and "lib",
 
  $ ./configure --with-zlib=/cygdrive/c/usr/include,/cygdrive/c/usr/lib
 
       Through the CPPFLAGS and LDFLAGS Variables
-           
-       For example, if zlib was installed in the directory 
-       /cygdrive/c/usr then using the following command to configure 
+
+       For example, if zlib was installed in the directory
+       /cygdrive/c/usr then using the following command to configure
        HDF5 with zib
 
            $ CPPFLAGS=-I/cygdrive/c/usr/include \
            $ LDFLAGS=-L/cygdrive/c/usr/lib \
            $ ./configure
 
-    To specify the installation directories, using 
+    To specify the installation directories, using
 
             $ ./configure --prefix="path for installation"
-                 
-       By default, HDF5 library, header files, examples, and 
+
+       By default, HDF5 library, header files, examples, and
        support programs will be installed in /usr/local/lib,
        /usr/local/include, /usr/local/doc/hdf5/examples, and
-       /usr/local/bin. To use a path other than /usr/local specify 
+       /usr/local/bin. To use a path other than /usr/local specify
        the path with the `--prefix=PATH' switch as in the above
        command.
 
-    Combination of Switches 
+    Combination of Switches
 
-       All of the above switches can be combined together. For 
-       example, if users want to configure HDF5 C/C++/Fortran 
-       library with szip library enabled, with zlib library at 
-       /cygdrive/c/usr/, and install HDF5 into directory 
+       All of the above switches can be combined together. For
+       example, if users want to configure HDF5 C/C++/Fortran
+       library with szip library enabled, with zlib library at
+       /cygdrive/c/usr/, and install HDF5 into directory
        /cygdrive/c/hdf5 using gcc/g++ as C/C++ compiler and gfortran
        as fortran compiler
-     
+
            $ ./configure
              --with-szlib=/cygdrive/c/szip
              --with-zlib=/cygdrive/c/usr/include,/cygdrive/c/usr/lib
              --prefix=/cygdrive/c/hdf5
              --enable-cxx
-             --enable-fortran 
+             --enable-fortran
              <"If no more switches, then hit Enter">
 
        Notes: The command format above is for readilibity. In practice,
               please type in the command above with at least one
-              space between each line, No "Enter" until users finish 
-              the switches and want to run the configure. 
+              space between each line, No "Enter" until users finish
+              the switches and want to run the configure.
+
 
- 
      or do it through CPPFLAGS and LDFLAGS variables:
-     
+
            $ CPPFLAGS=-I/cygdrive/c/usr/include \
            $ LDFLAGS=-L/cygdrive/c/usr/lib \
 
@@ -229,38 +229,38 @@ Build, Test and Install HDF5 on Cygwin
              --with-szlib=/cygdrive/c/szip
              --prefix=/cygdrive/c/hdf5
              --enable-cxx
-             --enable-fortran 
+             --enable-fortran
              <"If no more switches, then hit Enter">
-                          
+
 5. Make and Make Check
 
    After configuration is done successfully, run the following series of
    commands to build, test and install HDF5
-    
+
             $ make          > "output file name"
             $ make check    > "output file name"
-            
+
    Before run "make install", check output file for "make check", there
    should be no failures at all.
 
 6. Make Install
 
             $ make install  > "output file name"
-   
-     
+
+
 7. Check installed HDF5 library
 
-   After step 6, go to your installation directory, there should be 
+   After step 6, go to your installation directory, there should be
    three subdirectories: "bin" "include" and "lib".
 
-8. Known Problems 
-   
+8. Known Problems
+
    dt_arith tests may fail due to the use of fork. This is a known issue
    with cygwin on Windows.
 
    "make check" fails when building shared lib files is enabled.  The default
    on Cygwin has been changed to disable shared.  It can be enabled with
-   the --enable-shared configure option but is likely to fail "make check" 
+   the --enable-shared configure option but is likely to fail "make check"
    with GCC compilers.
 
 -----------------------------------------------------------------------
diff --git a/release_docs/README_HDF5_CMake b/release_docs/README_HDF5_CMake
index 8df2ef5..126a4cd 100644
--- a/release_docs/README_HDF5_CMake
+++ b/release_docs/README_HDF5_CMake
@@ -6,16 +6,16 @@ This tar file contains
     CTestScript.cmake
     HDF5config.cmake    CMake scripts for building HDF5
     HDF5options.cmake
-    hdf5-1.10.6         HDF5 1.10.6 source
+    hdf5-1.10.7         HDF5 1.10.7 source
     SZip.tar.gz         source for building SZIP
     ZLib.tar.gz         source for building ZLIB
 
 For more information about building HDF5 with CMake, see USING_HDF5_CMake.txt in
-hdf5-1.10.6/release_docs, or
+hdf5-1.10.7/release_docs, or
 https://portal.hdfgroup.org/display/support/Building+HDF5+with+CMake.
 
 For more information about building HDF5 with CMake on HPC machines, including
-cross compiling on Cray XC40, see README_HPC in hdf5-1.10.6/release_docs.
+cross compiling on Cray XC40, see README_HPC in hdf5-1.10.7/release_docs.
 
 
 
diff --git a/release_docs/README_HPC b/release_docs/README_HPC
index 67a5d6c..513064c 100644
--- a/release_docs/README_HPC
+++ b/release_docs/README_HPC
@@ -1,6 +1,6 @@
 ************************************************************************
 *    Using CMake to build and test HDF5 source on HPC machines         *
-************************************************************************ 
+************************************************************************
 
                     Contents
 
@@ -16,34 +16,34 @@ Section VI:    Other cross compiling options
 ========================================================================
 I. Prerequisites
 ========================================================================
-    1. Create a working directory that is accessible from the compute nodes for 
+    1. Create a working directory that is accessible from the compute nodes for
        running tests; the working directory should be in a scratch space or a
        parallel file system space since testing will use this space.  Building
-       from HDF5 source in a 'home' directory typically results in test 
+       from HDF5 source in a 'home' directory typically results in test
        failures and should be avoided.
-	  
-    2. Load modules for desired compilers, module for cmake version 3.10 or greater, 
+
+    2. Load modules for desired compilers, module for cmake version 3.12 or greater,
        and set any needed environment variables for compilers (i.e., CC, FC, CXX).
        Unload any problematic modules (i.e., craype-hugepages2M).
 
 ========================================================================
 II. Obtain HDF5 source
 ========================================================================
-Obtain HDF5 source code from the HDF5 repository using a git command or 
+Obtain HDF5 source code from the HDF5 repository using a git command or
 from a release tar file in a working directory:
 
-    git clone https://git@bitbucket.hdfgroup.org/scm/hdffv/hdf5.git 
+    git clone https://git@bitbucket.hdfgroup.org/scm/hdffv/hdf5.git
         [-b branch] [source directory]
 
 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 
+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.11.4", or for the first hdf5_1_10_5 pre-release version, 
-it should be renamed "hdf5-1.10.5-pre1".
+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 
+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
 the source directory renamed 'hdf5-<version string>'.
 
@@ -57,23 +57,23 @@ The ctest command [1]:
 
   ctest -S HDF5config.cmake,BUILD_GENERATOR=Unix -C Release -V -O hdf5.log
 
-will configure, build, test and package HDF5 from the downloaded source 
+will configure, build, test and package HDF5 from the downloaded source
 after the setup steps outlined below are followed.
 
-CMake option variables are available to allow running test programs in batch 
-scripts on compute nodes and to cross-compile for compute node hardware using 
+CMake option variables are available to allow running test programs in batch
+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.  
+parallel or serial only builds available to the CMake command.
 
-    1. For the current 'develop' version the "hdf5" directory should be renamed 
-       "hdf5-1.11.4".
+    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-1.11.4/config/cmake/scripts/HDF5config.cmake
-       hdf5-1.11.4/config/cmake/scripts/CTestScript.cmake
-       hdf5-1.11.4/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.
 
@@ -82,16 +82,16 @@ parallel or serial only builds available to the CMake command.
        CTestScript.cmake
        HDF5config.cmake
        HDF5options.cmake
-       hdf5-1.11.4
+       hdf5-1.13.0
 
-       Additionally, when the ctest command runs [1], it will add a build directory 
+       Additionally, when the ctest command runs [1], it will add a build directory
        in the working directory.
 
     4. The following options (among others) can be added to the ctest
        command [1], following '-S HDF5config.cmake,' and separated by ',':
 
        HPC=sbatch   (or 'bsub' or 'raybsub') indicates which type of batch
-                     files to use for running tests.  If omitted, test 
+                     files to use for running tests.  If omitted, test
                      will run on the local machine or login node.
 
        KNL=true      to cross-compile for KNL compute nodes on CrayXC40
@@ -104,27 +104,27 @@ parallel or serial only builds available to the CMake command.
 
        The HPC options will add BUILD_GENERATOR=Unix for the three HPC options.
        An example ctest command for a parallel build on a system using sbatch is
-   
+
          ctest -S HDF5config.cmake,HPC=sbatch,MPI=true -C Release -V -O hdf5.log
 
-       Adding the option 'KNL=true' to the above list will compile for KNL nodes, 
+       Adding the option 'KNL=true' to the above list will compile for KNL nodes,
        for example, on 'mutrino' and other CrayXC40 machines.
 
-       Changing -V to -VV will produce more logging information in HDF5.log. 
+       Changing -V to -VV will produce more logging information in HDF5.log.
 
-    More detailed CMake information can be found in the HDF5 source in 
+    More detailed CMake information can be found in the HDF5 source in
     release_docs/INSTALL_CMake.txt.
 
 ========================================================================
 IV. Cross-compiling
 ========================================================================
-For cross-compiling on Cray, set environment variables CC=cc, FC=ftn 
+For cross-compiling on Cray, set environment variables CC=cc, FC=ftn
 and CXX=CC (for c++) after all compiler modules are loaded since switching
 compiler modules may unset or reset these variables.
 
-CMake provides options for cross-compiling.  To cross-compile for KNL hardware 
-on mutrino and other CrayXC40 machines, add HPC=sbatch,KNL=true to the 
-ctest command line.  This will set the following options from the 
+CMake provides options for cross-compiling.  To cross-compile for KNL hardware
+on mutrino and other CrayXC40 machines, add HPC=sbatch,KNL=true to the
+ctest command line.  This will set the following options from the
 config/cmake/scripts/HPC/sbatch-HDF5options.cmake file:
 
     set (COMPILENODE_HWCOMPILE_MODULE "craype-haswell")
@@ -133,74 +133,74 @@ config/cmake/scripts/HPC/sbatch-HDF5options.cmake file:
     set (LOCAL_BATCH_SCRIPT_PARALLEL_NAME "knl_ctestP.sl")
     set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_TOOLCHAIN_FILE:STRING=config/toolchain/crayle.cmake")
 
-On the Cray XC40 the craype-haswell module is needed for configuring, and the 
+On the Cray XC40 the craype-haswell module is needed for configuring, and the
 craype-mic-knl module is needed for building to run on the KNL nodes. CMake
-with the above options will swap modules after configuring is complete, 
+with the above options will swap modules after configuring is complete,
 but before compiling programs for KNL.
 
 The sbatch script arguments for running jobs on KNL nodes may differ on CrayXC40
-machines other than mutrino.  The batch scripts knl_ctestS.sl and knl_ctestP.sl 
-have the correct arguments for mutrino:  "#SBATCH -p knl -C quad,cache".  For 
-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-1.11.4/bin/batch.
+machines other than mutrino.  The batch scripts knl_ctestS.sl and knl_ctestP.sl
+have the correct arguments for mutrino:  "#SBATCH -p knl -C quad,cache".  For
+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-1.13.0/bin/batch.
 
 ========================================================================
 V. Manual alternatives
 ========================================================================
-If using ctest is undesirable, one can create a build directory and run the cmake 
+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/3.10.2/bin/cmake" 
--C "<working directory>/hdf5-1.11.4/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/1.11.4 
--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 
--DHDF5_PACKAGE_EXTLIBS:BOOL=ON -DLOCAL_BATCH_TEST:BOOL=ON 
--DMPIEXEC_EXECUTABLE:STRING=srun -DMPIEXEC_NUMPROC_FLAG:STRING=-n 
--DMPIEXEC_MAX_NUMPROCS:STRING=6 
--DCMAKE_TOOLCHAIN_FILE:STRING=config/toolchain/crayle.cmake 
--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-1.11.4"
+"/projects/Mutrino/hpcsoft/cle6.0/common/cmake/3.12/bin/cmake"
+-C "<working directory>/hdf5-1.13.0/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/1.13.0
+-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
+-DHDF5_PACKAGE_EXTLIBS:BOOL=ON -DLOCAL_BATCH_TEST:BOOL=ON
+-DMPIEXEC_EXECUTABLE:STRING=srun -DMPIEXEC_NUMPROC_FLAG:STRING=-n
+-DMPIEXEC_MAX_NUMPROCS:STRING=6
+-DCMAKE_TOOLCHAIN_FILE:STRING=config/toolchain/crayle.cmake
+-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-1.13.0"
 
 followed by make and batch jobs to run tests.
 
-To cross-compile on CrayXC40, run the configure command with the craype-haswell 
+To cross-compile on CrayXC40, run the configure command with the craype-haswell
 module loaded, then switch to the craype-mic-knl module for the build process.
 
-Tests on machines using slurm can be run with 
+Tests on machines using slurm can be run with
 
-"sbatch -p knl -C quad,cache ctestS.sl" 
+"sbatch -p knl -C quad,cache ctestS.sl"
 
-or 
+or
 
-"sbatch -p knl -C quad,cache ctestP.sl" 
+"sbatch -p knl -C quad,cache ctestP.sl"
 
 for parallel builds.
- 
+
 Tests on machines using LSF will typically use "bsub ctestS.lsf", etc.
 
 ========================================================================
 VI.    Other cross compiling options
 ========================================================================
-Settings for two other cross-compiling options are also in the config/toolchain 
+Settings for two other cross-compiling options are also in the config/toolchain
 files which do not seem to be necessary with the Cray PrgEnv-* modules
 
-1.  HDF5_USE_PREGEN.  This option, along with the HDF5_USE_PREGEN_DIR CMake 
-    variable would allow the use of an appropriate H5Tinit.c file with type 
-	information generated on a compute node to be used when cross compiling 
-	for those compute nodes.  The use of the variables in lines 110 and 111 
-	of HDF5options.cmake file seem to preclude needing this option with the 
-	available Cray modules and CMake option.
-
-2.  HDF5_BATCH_H5DETECT and associated CMake variables.  This option when 
-    properly configured will run H5detect in a batch job on a compute node 
-	at the beginning of the CMake build process.  It was also found to be 
-	unnecessary with the available Cray modules and CMake options.
+1.  HDF5_USE_PREGEN.  This option, along with the HDF5_USE_PREGEN_DIR CMake
+    variable would allow the use of an appropriate H5Tinit.c file with type
+    information generated on a compute node to be used when cross compiling
+    for those compute nodes.  The use of the variables in lines 110 and 111
+    of HDF5options.cmake file seem to preclude needing this option with the
+    available Cray modules and CMake option.
+
+2.  HDF5_BATCH_H5DETECT and associated CMake variables.  This option when
+    properly configured will run H5detect in a batch job on a compute node
+    at the beginning of the CMake build process.  It was also found to be
+    unnecessary with the available Cray modules and CMake options.
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index d8b4eca..1ec10fc 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -47,6 +47,20 @@ New Features
 
     Configuration:
     -------------
+    - Update CMake minimum version to 3.12
+
+      Updated CMake minimum version to 3.12 and added version checks
+      for Windows features.
+
+      (ADB - 2020/02/05, TRILABS-142)
+
+    - Fixed CMake include properties for Fortran libraries
+
+      Corrected the library properties for Fortran to use the
+      correct path for the Fortran module files.
+
+      (ADB - 2020/02/04, HDFFV-11012)
+
     - Added common warnings files for gnu and intel
 
       Added warnings files to use one common set of flags
diff --git a/release_docs/USING_CMake_Examples.txt b/release_docs/USING_CMake_Examples.txt
index 21e153f..f0ea83c 100644
--- a/release_docs/USING_CMake_Examples.txt
+++ b/release_docs/USING_CMake_Examples.txt
@@ -22,7 +22,7 @@ I. Preconditions
 
    1. We suggest you obtain the latest CMake for windows from the Kitware
       web site. The HDF5 1.10.x product requires a minimum CMake version
-      of 3.10.2. If you are using VS2019, the minimum version is 3.15.
+      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
diff --git a/release_docs/USING_HDF5_CMake.txt b/release_docs/USING_HDF5_CMake.txt
index 73a24d9..4afd8df 100644
--- a/release_docs/USING_HDF5_CMake.txt
+++ b/release_docs/USING_HDF5_CMake.txt
@@ -37,7 +37,7 @@ I. Preconditions
 
    1. We suggest you obtain the latest CMake for windows from the Kitware
       web site. The HDF5 1.10.x product requires a minimum CMake version
-      of 3.10.1.
+      of 3.12.
 
    2. You have installed the HDF5 library built with CMake, by executing
       the HDF Install Utility (the *.msi file in the binary package for
@@ -180,7 +180,7 @@ Given the preconditions in section I, create a CMakeLists.txt file at the
 source root. Include the following text in the file:
 
 ##########################################################
-cmake_minimum_required (VERSION 3.10)
+cmake_minimum_required (VERSION 3.12)
 project (HDF5MyApp C CXX)
 
 set (LIB_TYPE STATIC) # or SHARED