[svn-r24336] Bring revisions #24118 - #24200 from trunk.

2 files changed, 38 insertions, 15 deletions

diff --git a/release_docs/INSTALL_CMake.txt b/release_docs/INSTALL_CMake.txt
index 95ebec9..80a13f7 100644
--- a/release_docs/INSTALL_CMake.txt
+++ b/release_docs/INSTALL_CMake.txt
@@ -8,7 +8,8 @@ Section I:   Quick Step Building HDF5 Libraries with CMake
 Section II:  Preconditions
 Section III: Building HDF5 C/C++ Libraries with CMake
 Section IV:  All Options for HDF5 C/C++ Libraries with CMake
-Section V:   APPENDIX
+Section V:   User Defined Options for HDF5 Libraries with CMake
+Section VI:  APPENDIX
 
 ************************************************************************
 
@@ -102,7 +103,7 @@ II. Preconditions
             HDF5_ALLOW_EXTERNAL_SUPPORT:STRING="TGZ"
             ZLIB_TGZ_NAME:STRING="zlib_src.ext"
             SZIP_TGZ_NAME:STRING="szip_src.ext"
-            TGZ_PATH:STRING="some_location"
+            TGZPATH:STRING="some_location"
          where "some_location" is the URL or full path to the compressed 
          file and ext is the type of compression file.
                                     
@@ -327,7 +328,7 @@ These five steps are described in detail below.
            file) are:
                ZLIB_TGZ_NAME:STRING="zlib_src.ext"
                SZIP_TGZ_NAME:STRING="szip_src.ext"
-               TGZ_PATH:STRING="some_location"
+               TGZPATH:STRING="some_location"
             where "some_location/xxxx_src.ext" is the URL or full path to 
             the compressed file and where ext is the type of the compression 
             file such as .bz2, .tar, .tar.gz, .tgz, or .zip.
@@ -445,11 +446,29 @@ HDF5_USE_FILTER_SCALEOFFSET "Use the SCALEOFFSET Filter"             ON
 HDF5_USE_FILTER_SHUFFLE     "Use the SHUFFLE Filter"                 ON
 IF (HDF5_ENABLE_SZIP_SUPPORT) 
     HDF5_ENABLE_SZIP_ENCODING "Use SZip Encoding"      OFF
+IF (WINDOWS)
+    H5_DEFAULT_PLUGINDIR    "%ALLUSERSPROFILE%/hdf5/lib/plugin"
+ELSE (WINDOWS)
+    H5_DEFAULT_PLUGINDIR    "/usr/local/hdf5/lib/plugin"
+ENDIF (WINDOWS)
 
 
 
 ========================================================================
-V. APPENDIX
+V. User Defined Options for HDF5 Libraries with CMake
+========================================================================
+
+Support for User Defined macros and options has been added. The file
+UserMacros.cmake has an example of the technique. In the folder,
+config/cmake/UserMacros, is an implementation for Windows Visual Studio
+users for linking libraries to the static CRT - Windows_MT.cmake. 
+
+Copy the contents of the file, both macro and option, into the 
+UserMacros.cmake file. Then enable the option to the CMake configuration,
+build and test process.
+
+========================================================================
+VI. APPENDIX
 ========================================================================
 
 Below are examples of the ctest scripts used by The HDF Group.
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 3a61890..482a9da 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -1,4 +1,4 @@
-HDF5 version 1.9.164-swmr0 currently under development
+HDF5 version 1.9.165-swmr0 currently under development
 
 
 INTRODUCTION
@@ -42,8 +42,9 @@ New Features
     -------------
     - New configuration option added to change the default plugin path.
       configure option is --with-default-plugin=location
-      cmake option is -DH5_DEFAULT_PLUGIN:PATH=location
+      cmake option is -DH5_DEFAULT_PLUGINDIR:PATH=location
       HDFFV-8513.  (ADB 2013/09/04)
+    - Rename FFLAGS to FCFLAGS in configure (ADB 2013/08/13)
     - CMake minimum is now 2.8.10. (ADB 2013/01/14)
     - A new tool, cmakehdf5, which is a build command script similar to
       buildhdf5 is added and is available in the bin directory.
@@ -676,6 +677,9 @@ Bug Fixes since HDF5-1.8.0 release
 
     Configuration
     -------------
+    - Modified H5detect.c to scan floating point types for padding bits before
+      analyzing the type further.  This should fix problems with gcc 4.8
+      (NAF - 2013/09/19 - HDFFV-8523/HDFFV-8500)
     - Fixed Makefile issue in which "-Wl," was not properly specified
       prior to -rpath when building parallel fortran libraries with
       an Intel compiler. (MAM - 2012/03/26)
@@ -1170,13 +1174,13 @@ Supported Platforms
     Windows 7                     Visual Studio 2008 w/ Intel Fortran 11 (cmake)
                                   Visual Studio 2010 w/ Intel Fortran 12 (cmake)
                                   Visual Studio 2012 w/ Intel Fortran 13 (cmake)
-                                  Cygwin(CYGWIN_NT-6.1 1.7.15(0.260/5/3) gcc(4.5.3) compiler and gfortran)
+                                  Cygwin(CYGWIN_NT-6.1 1.7.25(0.270/5/3) gcc(4.7.3) compiler and gfortran)
                                   (cmake and autotools)
 
     Windows 7 x64                 Visual Studio 2008 w/ Intel Fortran 11 (cmake)
                                   Visual Studio 2010 w/ Intel Fortran 12 (cmake)
                                   Visual Studio 2012 w/ Intel Fortran 13 (cmake)
-                                  Cygwin(CYGWIN_NT-6.1 1.7.15(0.260/5/3) gcc(4.5.3) compiler and gfortran)
+                                  Cygwin(CYGWIN_NT-6.1 1.7.25(0.270/5/3) gcc(4.8.1) compiler and gfortran)
                                   (cmake and autotools)
     Windows 8                     Visual Studio 2012 w/ Intel Fortran 13 (cmake)
 
@@ -1217,7 +1221,7 @@ Platform                              C         F90/   F90      C++  zlib  SZIP
 Solaris2.11 32-bit                      n        y/y    n        y    y     y
 Solaris2.11 64-bit                      n        y/n    n        y    y     y
 Windows 7                               y        y/y    n        y    y     y
-Windows 7     x64                       y        y/y    n        y    y     y
+Windows 7 x64                           y        y/y    n        y    y     y
 Windows 7 Cygwin                        n        y/n    n        y    y     y
 Windows 7 x64 Cygwin                    n        y/n    n        y    y     y
 Windows 8                               y        y/y    n        y    y     y
@@ -1297,14 +1301,14 @@ The following platforms are not supported but have been tested for this release.
                                   GNU Fortran (GCC) 4.8.1 20130603 (Red Hat 4.8.1-1)
                                   (cmake and autotools)
 
-    SUSE 12.3 3.4.6-2.10-desktop #1 SMP PREEMPT i686 i686 i386 GNU/Linux
-                                  gcc (SUSE Linux) 4.7.1
-                                  GNU Fortran (SUSE Linux) 4.7.1
+    SUSE 12.3 3.7.10-1.1-desktop #1 SMP PREEMPT i686 i686 i386 GNU/Linux
+                                  gcc (SUSE Linux) 4.7.2
+                                  GNU Fortran (SUSE Linux) 4.7.2
                                   (cmake and autotools)
 
-    SUSE 12.3 3.4.6-2.10-desktop #1 SMP PREEMPT x86_64 x86_64 x86_64 GNU/Linux
-                                  gcc (SUSE Linux) 4.7.1
-                                  GNU Fortran (SUSE Linux) 4.7.1 
+    SUSE 12.3 3.7.10-1.1-desktop #1 SMP PREEMPT x86_64 x86_64 x86_64 GNU/Linux
+                                  gcc (SUSE Linux) 4.7.2
+                                  GNU Fortran (SUSE Linux) 4.7.2 
                                   (cmake and autotools)
 
     Ubuntu 13.04 3.8.0-26-generic #38-Ubuntu SMP i686 GNU/Linux