[svn-r24703] Add Binary README.txt file generation

Tested: local linux cmake

4 files changed, 86 insertions, 2 deletions

diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake
index 0d071e7..98c75c9 100644
--- a/CMakeInstallation.cmake
+++ b/CMakeInstallation.cmake
@@ -137,6 +137,46 @@ IF (HDF5_PACK_EXAMPLES)
 ENDIF (HDF5_PACK_EXAMPLES)
 
 #-----------------------------------------------------------------------------
+# Configure the README.txt file for the binary package
+#-----------------------------------------------------------------------------
+SET (BINARY_SYSTEM_NAME ${CMAKE_SYSTEM_NAME})
+SET (BINARY_PLATFORM "${CMAKE_SYSTEM_NAME}")
+IF (WIN32)
+  SET (BINARY_EXAMPLE_ENDING "zip")
+  SET (BINARY_INSTALL_ENDING "exe")
+  IF (CMAKE_CL_64)
+    SET (BINARY_SYSTEM_NAME "win64")
+  ELSE (CMAKE_CL_64)
+    SET (BINARY_SYSTEM_NAME "win32")
+  ENDIF (CMAKE_CL_64)
+  IF (${CMAKE_SYSTEM_VERSION} MATCHES "6.1")
+    SET (BINARY_PLATFORM "${BINARY_PLATFORM} 7")
+  ELSEIF (${CMAKE_SYSTEM_VERSION} MATCHES "6.2")
+    SET (BINARY_PLATFORM "${BINARY_PLATFORM} 8")
+  ENDIF (${CMAKE_SYSTEM_VERSION} MATCHES "6.1")
+  SET (BINARY_PLATFORM "${BINARY_PLATFORM} ${MSVC_C_ARCHITECTURE_ID}")
+  SET (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO ${CMAKE_C_COMPILER_VERSION}")
+ELSEIF (APPLE)
+  SET (BINARY_EXAMPLE_ENDING "tar.gz")
+  SET (BINARY_INSTALL_ENDING "dmg")
+  SET (BINARY_PLATFORM "${BINARY_PLATFORM} ${CMAKE_SYSTEM_VERSION} ${CMAKE_SYSTEM_PROCESSOR}")
+  SET (BINARY_PLATFORM "${BINARY_PLATFORM}, using ${CMAKE_C_COMPILER_ID} C ${CMAKE_C_COMPILER_VERSION}")
+ELSE (WIN32)
+  SET (BINARY_EXAMPLE_ENDING "tar.gz")
+  SET (BINARY_INSTALL_ENDING "sh")
+  SET (BINARY_PLATFORM "${BINARY_PLATFORM} ${CMAKE_SYSTEM_VERSION} ${CMAKE_SYSTEM_PROCESSOR}")
+  SET (BINARY_PLATFORM "${BINARY_PLATFORM}, using ${CMAKE_C_COMPILER_ID} C ${CMAKE_C_COMPILER_VERSION}")
+ENDIF (WIN32)
+IF (HDF4_BUILD_FORTRAN)
+  SET (BINARY_PLATFORM "${BINARY_PLATFORM} / ${CMAKE_Fortran_COMPILER_ID} Fortran")
+ENDIF (HDF4_BUILD_FORTRAN)
+
+CONFIGURE_FILE (
+    ${HDF5_RESOURCES_DIR}/README.txt.cmake.in 
+    ${HDF5_BINARY_DIR}/README.txt @ONLY
+)
+
+#-----------------------------------------------------------------------------
 # Add Document File(s) to CMake Install
 #-----------------------------------------------------------------------------
 IF (NOT HDF5_EXTERNALLY_CONFIGURED)
@@ -236,7 +276,6 @@ IF (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES)
     SET (CPACK_COMPONENTS_ALL_IN_ONE_PACKAGE ON)
     SET (CPACK_PACKAGE_DEFAULT_LOCATION "/opt/${CPACK_PACKAGE_NAME}")
     SET (CPACK_PACKAGING_INSTALL_PREFIX "/")
-    SET (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}")
     SET (CPACK_PACKAGE_ICON "${HDF5_RESOURCES_DIR}/hdf.gif")
     SET (CPACK_SET_DESTDIR TRUE) # Required when packaging, and set CMAKE_INSTALL_PREFIX to "/".
     
diff --git a/MANIFEST b/MANIFEST
index 64f79cb..91e088d 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -2448,6 +2448,7 @@
 ./config/cmake/hdf.gif
 ./config/cmake/NSIS.template.in
 ./config/cmake/NSIS.InstallOptions.ini.in
+./config/cmake/README.txt.cmake.in
 
 # CMake-specific User Files
 ./config/cmake/UserMacros/Windows_MT.cmake
diff --git a/config/cmake/README.txt.cmake.in b/config/cmake/README.txt.cmake.in
new file mode 100755
index 0000000..5e1f65a
--- /dev/null
+++ b/config/cmake/README.txt.cmake.in
@@ -0,0 +1,44 @@
+@HDF5_PACKAGE_NAME@ version @HDF5_PACKAGE_VERSION_STRING@

+------------------------------------------------------------------------------

+

+This directory contains the binary (release) distribution of 

+@HDF5_PACKAGE_NAME@ @HDF5_PACKAGE_VERSION_MAJOR@ that was compiled on;

+    @BINARY_PLATFORM@. 

+

+It was built with the following options: 

+    -- @LIB_TYPE@ C/C++/Fortran libraries

+    -- SZIP (encoder enabled) and ZLIB

+    -- @LIB_TYPE@ HDF5 tools

+

+The contents of this directory are:

+

+    COPYING                 - Copyright notice

+    README.txt              - This file

+    @HDF5_PACKAGE_NAME@-@HDF5_PACKAGE_VERSION@-@BINARY_SYSTEM_NAME@.@BINARY_INSTALL_ENDING@    - HDF5 Install Package

+

+The compressed examples file HDF5Examples-0.1.1-Source.@BINARY_EXAMPLE_ENDING@, located in the 

+HDF5 install folder, can be built and tested with CMake and the supplied

+HDF518_Examples.cmake file. The HDF518_Examples.cmake expects HDF5 to have

+been installed in the default location with above compilers.

+

+To test the installation with the examples;

+    Create a directory to run the examples.

+    Copy HDF5Examples-0.1.1-Source.@BINARY_EXAMPLE_ENDING@ to this directory, do NOT unzip.

+    Copy HDF518_Examples.cmake to this directory.

+    Edit HDF518_Examples.cmake line 8 to set INSTALLDIR to where HDF5 is installed.

+    Execute from this directory: 

+        ctest -S HDF518_Examples.cmake,HDF5Examples-0.1.1-Source -C Release -O test.log

+

+When executed, the ctest script will save the results to the log file, test.log, as

+indicated by the ctest command. If you wish the to see more build and test information, 

+add "-VV" to the ctest command.

+

+For more information see USING_CMake_Examples.txt in the install folder. 

+

+Documentation for this release can be found at the following URL:

+    http://www.hdfgroup.org/HDF5/doc/.

+

+See the HDF5 home page for further details:

+    http://hdfgroup.org/HDF5/

+

+Bugs should be reported to help@hdfgroup.org.

diff --git a/config/cmake/libhdf5.settings.cmake.in b/config/cmake/libhdf5.settings.cmake.in
index 4027c55..3970a9f 100644
--- a/config/cmake/libhdf5.settings.cmake.in
+++ b/config/cmake/libhdf5.settings.cmake.in
@@ -3,7 +3,7 @@
 
 General Information:
 -------------------
-                   HDF5 Version: @HDF5_PACKAGE_VERSION@
+                   HDF5 Version: @HDF5_PACKAGE_VERSION_STRING@
                   Configured on: @CONFIG_DATE@
                   Configured by: @CMAKE_GENERATOR@
                  Configure mode: CMAKE @CMAKE_VERSION@