[svn-r24432] Update examples package install location and text files

3 files changed, 93 insertions, 74 deletions

diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake
index 18464ac..1a4c2fa 100644
--- a/CMakeInstallation.cmake
+++ b/CMakeInstallation.cmake
@@ -200,11 +200,11 @@ ENDIF (NOT HDF5_EXTERNALLY_CONFIGURED)
 IF (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES)
   SET (CPACK_PACKAGE_VENDOR "HDF_Group")
   SET (CPACK_PACKAGE_NAME "${HDF5_PACKAGE_NAME}")
-  SET (CPACK_PACKAGE_INSTALL_DIRECTORY "${HDF5_PACKAGE_NAME}")
   SET (CPACK_PACKAGE_VERSION "${HDF5_PACKAGE_VERSION}")
   SET (CPACK_PACKAGE_VERSION_MAJOR "${HDF5_PACKAGE_VERSION_MAJOR}")
   SET (CPACK_PACKAGE_VERSION_MINOR "${HDF5_PACKAGE_VERSION_MINOR}")
   SET (CPACK_PACKAGE_VERSION_PATCH "")
+  SET (CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_VENDOR}/${HDF5_PACKAGE_NAME}/${CPACK_PACKAGE_VERSION}")
   IF (EXISTS "${HDF5_SOURCE_DIR}/release_docs")
     SET (CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/release_docs/RELEASE.txt")
     SET (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/release_docs/COPYING")
@@ -215,6 +215,7 @@ IF (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES)
   SET (CPACK_GENERATOR "TGZ") 
   IF (WIN32)
     LIST (APPEND CPACK_GENERATOR "NSIS") 
+    SET (CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_VENDOR}\\\\${HDF5_PACKAGE_NAME}\\\\${CPACK_PACKAGE_VERSION}")
     SET (CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${LIB_TYPE}")
     SET (CPACK_MONOLITHIC_INSTALL ON)
     SET (CPACK_NSIS_CONTACT "${HDF5_PACKAGE_BUGREPORT}")
@@ -253,7 +254,9 @@ IF (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES)
 
     SET (CPACK_DEBIAN_PACKAGE_SECTION "Libraries")
     SET (CPACK_DEBIAN_PACKAGE_MAINTAINER "${HDF5_PACKAGE_BUGREPORT}")
-    
+
+#    LIST (APPEND CPACK_GENERATOR "RPM") 
+    SET (CPACK_RPM_PACKAGE_RELEASE "1")
     SET (CPACK_RPM_COMPONENT_INSTALL ON)
     SET (CPACK_RPM_PACKAGE_RELOCATABLE ON)
     SET (CPACK_RPM_PACKAGE_LICENSE "BSD-style")
@@ -276,6 +279,12 @@ IF (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES)
 The HDF5 data model, file format, API, library, and tools are open and distributed without charge.
 "
     )
+    
+    #-----------------------------------------------------------------------------
+    # Configure the spec file for the install RPM
+    #-----------------------------------------------------------------------------
+#    CONFIGURE_FILE ("${HDF5_RESOURCES_DIR}/hdf5.spec.in" "${CMAKE_CURRENT_BINARY_DIR}/${HDF5_PACKAGE_NAME}.spec" @ONLY IMMEDIATE)
+#    SET (CPACK_RPM_USER_BINARY_SPECFILE "${CMAKE_CURRENT_BINARY_DIR}/${HDF5_PACKAGE_NAME}.spec")
   ENDIF (WIN32)
   
   INCLUDE(InstallRequiredSystemLibraries)
diff --git a/config/cmake/HDF518_Examples.cmake.in b/config/cmake/HDF518_Examples.cmake.in
index 74da91c..c6be9ff 100644
--- a/config/cmake/HDF518_Examples.cmake.in
+++ b/config/cmake/HDF518_Examples.cmake.in
@@ -12,7 +12,7 @@ set(CTEST_SOURCE_NAME ${CTEST_SCRIPT_ARG})
 set(CTEST_DASHBOARD_ROOT ${CTEST_SCRIPT_DIRECTORY})
 set(CTEST_BUILD_CONFIGURATION "Release")
 #set(NO_MAC_FORTRAN "true")
-#set(BUILD_OPTIONS ""${BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=OFF")
+#set(BUILD_OPTIONS ""${BUILD_OPTIONS} -DHDF_BUILD_FORTRAN:BOOL=OFF")
 #set(BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF_ENABLE_F2003:BOOL=ON)
 
 ###############################################################################################################
diff --git a/release_docs/USING_CMake_Examples.txt b/release_docs/USING_CMake_Examples.txt
index bc2a13b..4dae021 100644
--- a/release_docs/USING_CMake_Examples.txt
+++ b/release_docs/USING_CMake_Examples.txt
@@ -1,71 +1,81 @@
-************************************************************************
-* Build and Test HDF5 Examples with CMake                              *
-************************************************************************
-
-Notes: This short instruction is written for users who want to quickly 
-       test the installation of HDF5 by using the CMake tools to build
-       and test the HDF5 Examples. The following instructions will show
-       the default usage and then present common changes for non-default
-       installations.
-       For more information, see the USING_HDF5_CMake.txt file.
-       
-       More information about using CMake can be found at the KitWare 
-       site, www.cmake.org.
-         
-       CMake uses the command line and these instructions use the script
-       method of the ctest command.
-
-
-========================================================================
-I. Preconditions                                                           
-========================================================================
-
-   1. We suggest you obtain the latest CMake for windows from the Kitware
-      web site. The HDF5 1.8.x product requires a minimum CMake version 
-      of 2.8.10.                     
-                                                                         
-   2. You have installed the HDF5 library built with CMake, by executing 
-      the HDF Install Utility (the *.exe file in the binary package for 
-      Windows). If you are using a Windows platform, you can obtain a 
-      pre-built Windows binary from The HDF Group's website at 
-      www.hdfgroup.org.
-
-
-
-========================================================================
-II. Building HDF5 Examples with CMake
-========================================================================
-
-Files in the HDF5 install directory:
-       HDF5Examples-0.1.1-Source.zip (or HDF5Examples-0.1.1-Source.tar.gz)
-       HDF518_Examples.cmake
-       
-Default installation process:
-       Create a directory to run the examples, i.e. \test_hdf5.
-       Copy HDF5Examples-0.1.1-Source.zip to this directory, do NOT unzip.
-       Copy HDF518_Examples.cmake to this directory.
-       Execute from this directory:
-          ctest -S HDF518_Examples.cmake,HDF5Examples-0.1.1-Source -C Release -O test.log
-
-The script will uncompress the examples file HDF5Examples-0.1.1-Source.zip,
-   and create a build directory inside the HDF5Examples-0.1.1-Source directory.
-   It will then configure, build, and execute the examples. All the log files
-   will be found under the build\Testing\Temporary directory, check these for
-   errors.
-   
-The amount of script information can be increased by adding -V to the ctest
-   command. Even more information can be shown by adding -VV instead of -V.
-
-
-========================================================================
-III. Common changes to the HDF518_Examples.cmake file
-========================================================================
-
-Line 8: change the INSTALLDIR to a different HDF5 install location.
-
-Line 14: uncomment to allow Mac machines to build shared examples.
-
-Line 15: uncomment to not build and test Fortran examples.
-
-Line 16: uncomment to build and test Fortran examples with F2003 option.
-
+************************************************************************

+* Build and Test HDF5 Examples with CMake                              *

+************************************************************************

+

+Notes: This short instruction is written for users who want to quickly 

+       test the installation of HDF5 by using the CMake tools to build

+       and test the HDF5 Examples. The following instructions will show

+       the default usage and then present common changes for non-default

+       installations.

+       For more information, see the USING_HDF5_CMake.txt file.

+       

+       More information about using CMake can be found at the KitWare 

+       site, www.cmake.org.

+         

+       CMake uses the command line and these instructions use the script

+       method of the ctest command.

+

+

+========================================================================

+I. Preconditions                                                           

+========================================================================

+

+   1. We suggest you obtain the latest CMake for windows from the Kitware

+      web site. The HDF5 1.8.x product requires a minimum CMake version 

+      of 2.8.10.                     

+                                                                         

+   2. You have installed the HDF5 library built with CMake, by executing 

+      the HDF Install Utility (the *.exe file in the binary package for 

+      Windows or the *.sh on Linux). If you are using a Windows platform, 

+      you can obtain a pre-built Windows binary from The HDF Group's website 

+      at www.hdfgroup.org. See Section "III. Common changes to the 

+      HDF518_Examples.cmake file", for the line to change the location.

+                                                                         

+   3. On Windows, you have installed the 7Zip package. See Section "III. 

+      Common changes to the HDF518_Examples.cmake file", for the line to 

+      change the command.

+

+

+

+========================================================================

+II. Building HDF5 Examples with CMake

+========================================================================

+

+Files in the HDF5 install directory:

+       HDF5Examples-0.1.1-Source.zip (or HDF5Examples-0.1.1-Source.tar.gz)

+       HDF518_Examples.cmake

+       

+Default installation process:

+       Create a directory to run the examples, i.e. \test_hdf5.

+       Copy HDF5Examples-0.1.1-Source.zip(.tar.gz) to this directory, do NOT unzip.

+       Copy HDF518_Examples.cmake to this directory.

+       Edit line 8 of the HDF518_Examples.cmake file and change the INSTALLDIR 

+           to the HDF5 install location.

+       

+       Execute from this directory:

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

+

+The script will uncompress the examples file HDF5Examples-0.1.1-Source.zip(.tar.gz),

+   and create a build directory inside the HDF5Examples-0.1.1-Source directory.

+   It will then configure, build, and execute the examples. All the log files

+   will be found under the build\Testing\Temporary directory, check these for

+   errors.

+   

+The amount of script information can be increased by adding -V to the ctest

+   command. Even more information can be shown by adding -VV instead of -V.

+

+

+========================================================================

+III. Common changes to the HDF518_Examples.cmake file

+========================================================================

+

+Line 8: change the INSTALLDIR to a different HDF5 install location.

+

+Line 14: uncomment to allow Mac machines to build shared examples.

+

+Line 15: uncomment to not build and test Fortran examples.

+

+Line 16: uncomment to build and test Fortran examples with F2003 option.

+

+Line 68: change the CTEST_7Z_COMMAND to a different unzip program.

+