summaryrefslogtreecommitdiffstats
path: root/release_docs
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2013-09-19 16:38:08 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2013-09-19 16:38:08 (GMT)
commit0653325f0d4a92164842bb30b797f130e44cbc68 (patch)
tree15fde81b28e60d8fcae7864edf0281a3ffdca153 /release_docs
parent4182c81addaaac3e4234369dc5a0089fb93756d9 (diff)
downloadhdf5-0653325f0d4a92164842bb30b797f130e44cbc68.zip
hdf5-0653325f0d4a92164842bb30b797f130e44cbc68.tar.gz
hdf5-0653325f0d4a92164842bb30b797f130e44cbc68.tar.bz2
[svn-r24167] HDFFV-8513, HDFFV-8522 Plugin testing in h5repack, h5dump.
Add more usage info for UserMacros. Add new option information about the Plugin default path. Tested: local linux, jam
Diffstat (limited to 'release_docs')
-rw-r--r--release_docs/INSTALL_CMake.txt23
-rw-r--r--release_docs/RELEASE.txt16
2 files changed, 29 insertions, 10 deletions
diff --git a/release_docs/INSTALL_CMake.txt b/release_docs/INSTALL_CMake.txt
index 5594610..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
************************************************************************
@@ -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 9a27d02..92a6ce4 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -43,7 +43,7 @@ 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)
- CMake minimum is now 2.8.10. (ADB 2013/01/14)
- A new tool, cmakehdf5, which is a build command script similar to
@@ -1218,7 +1218,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
@@ -1298,14 +1298,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