HDFFV-10962 add VS2019 support

4 files changed, 30 insertions, 33 deletions

diff --git a/release_docs/INSTALL_CMake.txt b/release_docs/INSTALL_CMake.txt
index 76a3fe4..57cfd7e 100644
--- a/release_docs/INSTALL_CMake.txt
+++ b/release_docs/INSTALL_CMake.txt
@@ -31,7 +31,8 @@ Obtaining HDF5 source code
 CMake version
    1. We suggest you obtain the latest CMake from the Kitware web site.
       The HDF5 1.10."X" product requires a minimum CMake version 3.10,
-      where "X" is the current HDF5 release version.
+      where "X" is the current HDF5 release version. If you are using
+      VS2019, the minimum version is 3.15.
 
 Note:
    To change the install prefix from the platform defaults initialize
@@ -90,6 +91,10 @@ To build HDF5 with the SZIP and ZLIB external libraries you will need to:
    5. From the "myhdfstuff" directory execute the CTest Script with the
       following options:
 
+      On 32-bit Windows with Visual Studio 2019, execute:
+         ctest -S HDF5config.cmake,BUILD_GENERATOR=VS2019 -C Release -VV -O hdf5.log
+      On 64-bit Windows with Visual Studio 2019, execute:
+         ctest -S HDF5config.cmake,BUILD_GENERATOR=VS201964 -C Release -VV -O hdf5.log
       On 32-bit Windows with Visual Studio 2017, execute:
          ctest -S HDF5config.cmake,BUILD_GENERATOR=VS2017 -C Release -VV -O hdf5.log
       On 64-bit Windows with Visual Studio 2017, execute:
@@ -439,12 +444,11 @@ These five steps are described in detail below.
             * MinGW Makefiles
             * NMake Makefiles
             * Unix Makefiles
-            * Visual Studio 11 2012
-            * Visual Studio 11 2012 Win64
-            * Visual Studio 12 2013
-            * Visual Studio 12 2013 Win64
             * Visual Studio 14 2015
             * Visual Studio 14 2015 Win64
+            * Visual Studio 15 2017
+            * Visual Studio 15 2017 Win64
+            * Visual Studio 16 2019
 
         <options> is:
             * SZIP_INCLUDE_DIR:PATH=<path to szip includes directory>
diff --git a/release_docs/README_HDF5_CMake b/release_docs/README_HDF5_CMake
index da0823c..8df2ef5 100644
--- a/release_docs/README_HDF5_CMake
+++ b/release_docs/README_HDF5_CMake
@@ -1,9 +1,9 @@
-This tar file contains 
+This tar file contains
 
     build-unix.sh       script to build HDF5 with CMake on unix machines
     build-unix-hpc.sh   script to build HDF5 with CMake on unix machines and run
                         tests with batch scripts (sbatch).
-    CTestScript.cmake   
+    CTestScript.cmake
     HDF5config.cmake    CMake scripts for building HDF5
     HDF5options.cmake
     hdf5-1.10.6         HDF5 1.10.6 source
@@ -11,10 +11,10 @@ This tar file contains
     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.6/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 
+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.
 
 
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 1b2ed03..166ad58 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -47,6 +47,14 @@ New Features
 
     Configuration:
     -------------
+    - Update CMake for VS2019 support
+
+      CMake added support for VS2019 in version 3.15. Changes to the CMake
+      generator setting required changes to scripts. Also updated version
+      references in CMake files as necessary.
+
+      (ADB - 2019/11/18, HDFFV-10962)
+
     - Update CMake tests to use FIXTURES
 
       CMake test fixtures allow setup/cleanup tests and other dependency
@@ -389,17 +397,16 @@ Supported Platforms
     (emu)                         Sun Fortran 95 8.6 SunOS_sparc
                                   Sun C++ 5.12 SunOS_sparc
 
-    Windows 7                     Visual Studio 2015 w/ Intel Fortran 16 (cmake)
+    Windows 7                     Visual Studio 2015 w/ Intel Fortran 18 (cmake)
 
-    Windows 7 x64                 Visual Studio 2013
-                                  Visual Studio 2015 w/ Intel Fortran 16 (cmake)
-                                  Visual Studio 2015 w/ Intel C, Fortran 2018 (cmake)
+    Windows 7 x64                 Visual Studio 2015 w/ Intel C, Fortran 2018 (cmake)
                                   Visual Studio 2015 w/ MSMPI 8 (cmake)
 
     Windows 10                    Visual Studio 2015 w/ Intel Fortran 18 (cmake)
 
     Windows 10 x64                Visual Studio 2015 w/ Intel Fortran 18 (cmake)
-                                  Visual Studio 2017 w/ Intel Fortran 18 (cmake)
+                                  Visual Studio 2017 w/ Intel Fortran 19 (cmake)
+                                  Visual Studio 2019 w/ Intel Fortran 19 (cmake)
 
     Mac OS X Yosemite 10.10.5     Apple clang/clang++ version 6.1 from Xcode 7.0
     64-bit                        gfortran GNU Fortran (GCC) 4.9.2
@@ -504,24 +511,10 @@ The following platforms are not supported but have been tested for this release.
     #1 SMP ppc64 GNU/Linux           IBM XL C/C++ for Linux, V13.1
     (ostrich)                        and IBM XL Fortran for Linux, V15.1
 
-    Debian 8.4 3.16.0-4-amd64 #1 SMP Debian 3.16.36-1 x86_64 GNU/Linux
-                                  gcc, g++ (Debian 4.9.2-10) 4.9.2
-                                  GNU Fortran (Debian 4.9.2-10) 4.9.2
-                                  (cmake and autotools)
-
-    Fedora 24  4.7.2-201.fc24.x86_64 #1 SMP x86_64 x86_64 x86_64 GNU/Linux
-                                  gcc, g++ (GCC) 6.1.1 20160621
-                                      (Red Hat 6.1.1-3)
-                                  GNU Fortran (GCC) 6.1.1 20160621
-                                      (Red Hat 6.1.1-3)
-                                  (cmake and autotools)
-
-    Ubuntu 16.04.1 4.4.0-38-generic #57-Ubuntu SMP x86_64 GNU/Linux
-                                  gcc, g++ (Ubuntu 5.4.0-6ubuntu1~16.04.2)
-                                      5.4.0 20160609
-                                  GNU Fortran (Ubuntu 5.4.0-6ubuntu1~16.04.2)
-                                      5.4.0 20160609
-                                  (cmake and autotools)
+   Fedora30 5.3.11-200.fc30.x86_64
+   #1 SMP x86_64  GNU/Linux       GNU gcc (GCC) 9.2.1 20190827 (Red Hat 9.2.1 20190827)
+                                  GNU Fortran (GCC) 9.2.1 20190827 (Red Hat 9.2.1 20190827)
+                                     (cmake and autotools)
 
 
 Known Problems
diff --git a/release_docs/USING_CMake_Examples.txt b/release_docs/USING_CMake_Examples.txt
index ea352fe..21e153f 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.
+      of 3.10.2. 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