[svn-r19991] Added ability to use compressed file for external libraries

Tested: local linux

3 files changed, 127 insertions, 66 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b3023d1..3b0b696 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -132,11 +132,6 @@ SET (HDF5_TOOLS_SRC_DIR      ${HDF5_SOURCE_DIR}/tools)
 SET (HDF5_PERFORM_SRC_DIR    ${HDF5_SOURCE_DIR}/perform)
 SET (HDF5_F90_SRC_DIR        ${HDF5_SOURCE_DIR}/fortran)
 
-# set default prefix location
-#IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-#  SET(CMAKE_INSTALL_PREFIX "hdf5" CACHE PATH "Install path prefix, prepended onto install directories" FORCE)
-#ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-
 IF (NOT HDF5_INSTALL_BIN_DIR)
   SET (HDF5_INSTALL_BIN_DIR bin)
 ENDIF (NOT HDF5_INSTALL_BIN_DIR)
@@ -443,16 +438,10 @@ INCLUDE (ExternalProject)
 OPTION (HDF5_ALLOW_EXTERNAL_SUPPORT "Allow External Library Building" "NO")
 OPTION (ZLIB_USE_EXTERNAL "Use External Library Building for ZLIB" 0)
 OPTION (SZIP_USE_EXTERNAL "Use External Library Building for SZIP" 0)
-IF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN")
+IF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
   SET (ZLIB_USE_EXTERNAL 1)
   SET (SZIP_USE_EXTERNAL 1)
-  IF (NOT ZLIB_SVN_URL)
-    SET (ZLIB_SVN_URL "http://svn.hdfgroup.uiuc.edu/zlib/trunk")
-  ENDIF (NOT ZLIB_SVN_URL)
-  IF (NOT SZIP_SVN_URL)
-    SET (SZIP_SVN_URL "http://svn.hdfgroup.uiuc.edu/szip/trunk")
-  ENDIF (NOT SZIP_SVN_URL)
-ENDIF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN")
+ENDIF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
 
 #-----------------------------------------------------------------------------
 # Option for ZLib support
@@ -470,15 +459,28 @@ IF (HDF5_ENABLE_Z_LIB_SUPPORT)
       SET (H5_ZLIB_HEADER "zlib.h")
       SET (ZLIB_INCLUDE_DIR_GEN ${ZLIB_INCLUDE_DIR})
     ELSE (ZLIB_FOUND)
-      IF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN")
-        EXTERNALPROJECT_ADD (ZLIB
-            SVN_REPOSITORY ${ZLIB_SVN_URL}
-            # [SVN_REVISION rev] 
-            INSTALL_COMMAND ""
-            CMAKE_ARGS
-                -DBLDTYPE:STRING=Release
-                -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
-        ) 
+      IF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
+        IF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN")
+          EXTERNALPROJECT_ADD (ZLIB
+              SVN_REPOSITORY ${ZLIB_SVN_URL}
+              # [SVN_REVISION rev] 
+              INSTALL_COMMAND ""
+              CMAKE_ARGS
+                  -DBLDTYPE:STRING=Release
+                  -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
+          ) 
+        ENDIF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN")
+        IF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
+          EXTERNALPROJECT_ADD (ZLIB
+              #LOG_DOWNLOAD 1
+              URL ${ZLIB_TGZ_URL}
+              URL_MD5 ""
+              INSTALL_COMMAND ""
+              CMAKE_ARGS
+                  -DBLDTYPE:STRING=Release
+                  -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
+          ) 
+        ENDIF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
         EXTERNALPROJECT_GET_PROPERTY (ZLIB BINARY_DIR SOURCE_DIR) 
 
         IF (BUILD_SHARED_LIBS)
@@ -516,9 +518,9 @@ IF (HDF5_ENABLE_Z_LIB_SUPPORT)
         SET (H5_HAVE_ZLIB_H 1)
         SET (H5_HAVE_LIBZ 1)
         MESSAGE (STATUS "Filter ZLIB is built")
-      ELSE (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN")
+      ELSE (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
         MESSAGE (FATAL " ZLib is Required for ZLib support in HDF5")
-      ENDIF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN")
+      ENDIF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
     ENDIF (ZLIB_FOUND)
   ELSE (NOT H5_ZLIB_HEADER)
     # This project is being called from within another and ZLib is already configured
@@ -547,16 +549,30 @@ IF (HDF5_ENABLE_SZIP_SUPPORT)
     SET (H5_HAVE_LIBSZ 1)
     SET (SZIP_INCLUDE_DIR_GEN ${SZIP_INCLUDE_DIR})
   ELSE (SZIP_FOUND)
-    IF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN")
-      EXTERNALPROJECT_ADD (SZIP
-          SVN_REPOSITORY ${SZIP_SVN_URL}
-          # [SVN_REVISION rev] 
-          INSTALL_COMMAND ""
-          CMAKE_ARGS
-              -DBLDTYPE:STRING=Release
-              -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
-              -DSZIP_ENABLE_ENCODING:BOOL=${HDF5_ENABLE_SZIP_ENCODING}
-      ) 
+    IF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
+      IF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN")
+        EXTERNALPROJECT_ADD (SZIP
+            SVN_REPOSITORY ${SZIP_SVN_URL}
+            # [SVN_REVISION rev] 
+            INSTALL_COMMAND ""
+            CMAKE_ARGS
+                -DBLDTYPE:STRING=Release
+                -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
+                -DSZIP_ENABLE_ENCODING:BOOL=${HDF5_ENABLE_SZIP_ENCODING}
+        ) 
+      ENDIF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN")
+      IF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
+        EXTERNALPROJECT_ADD (SZIP
+            #LOG_DOWNLOAD 1
+            URL ${SZIP_TGZ_URL}
+            URL_MD5 ""
+            INSTALL_COMMAND ""
+            CMAKE_ARGS
+                -DBLDTYPE:STRING=Release
+                -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
+                -DSZIP_ENABLE_ENCODING:BOOL=${HDF5_ENABLE_SZIP_ENCODING}
+        ) 
+      ENDIF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
       EXTERNALPROJECT_GET_PROPERTY (SZIP BINARY_DIR SOURCE_DIR) 
 
 
@@ -589,9 +605,9 @@ IF (HDF5_ENABLE_SZIP_SUPPORT)
       SET (H5_HAVE_SZLIB_H 1)
       SET (H5_HAVE_LIBSZ 1)
       MESSAGE (STATUS "Filter SZIP is built")
-    ELSE (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN")
+    ELSE (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
       MESSAGE (FATAL_ERROR "SZIP is Required for SZIP support in HDF5")
-    ENDIF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN")
+    ENDIF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
   ENDIF (SZIP_FOUND)
   SET (LINK_LIBS ${LINK_LIBS} ${SZIP_LIBRARIES})
   INCLUDE_DIRECTORIES (${SZIP_INCLUDE_DIRS})
@@ -623,10 +639,10 @@ IF (HDF5_PACKAGE_EXTLIBS)
     )
     GET_FILENAME_COMPONENT(ZLIB_LIB_NAME ${ZLIB_LIBRARY} NAME)
     SET (EXTERNAL_LIBRARY_LIST ${EXTERNAL_LIBRARY_LIST} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${ZLIB_LIB_NAME})
-    IF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN")
+    IF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
       ADD_DEPENDENCIES (ZLIB-GenHeader-Copy ZLIB)
       ADD_DEPENDENCIES (ZLIB-Library-Copy ZLIB)
-    ENDIF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN")
+    ENDIF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
   ENDIF (HDF5_ENABLE_Z_LIB_SUPPORT AND ZLIB_FOUND)
     
   IF (HDF5_ENABLE_SZIP_SUPPORT AND SZIP_FOUND)
@@ -641,10 +657,10 @@ IF (HDF5_PACKAGE_EXTLIBS)
     )
     GET_FILENAME_COMPONENT(SZIP_LIB_NAME ${SZIP_LIBRARY} NAME)
     SET (EXTERNAL_LIBRARY_LIST ${EXTERNAL_LIBRARY_LIST} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${SZIP_LIB_NAME})
-    IF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN")
+    IF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
       ADD_DEPENDENCIES (SZIP-GenHeader-Copy SZIP)
       ADD_DEPENDENCIES (SZIP-Library-Copy SZIP)
-    ENDIF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN")
+    ENDIF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
   ENDIF (HDF5_ENABLE_SZIP_SUPPORT AND SZIP_FOUND)
 ENDIF (HDF5_PACKAGE_EXTLIBS)
 
@@ -660,18 +676,18 @@ IF (WIN32 AND NOT CYGWIN)
           COMMAND ${CMAKE_COMMAND} -E copy_if_different ${ZLIB_BIN_PATH}/${ZLIB_DLL_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/
           COMMENT "Copying ${ZLIB_BIN_PATH}/${ZLIB_DLL_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX} to ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/"
       )
-      IF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN")
+      IF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
         ADD_DEPENDENCIES (ZLIB-Release-Copy ZLIB)
-      ENDIF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN")
+      ENDIF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
       IF (HDF5_PACKAGE_EXTLIBS)
         SET (EXTERNAL_LIBRARYDLL_LIST ${EXTERNAL_LIBRARYDLL_LIST} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${ZLIB_DLL_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
         ADD_CUSTOM_TARGET (ZLIB-Dll-Copy ALL
             COMMAND ${CMAKE_COMMAND} -E copy_if_different ${ZLIB_BIN_PATH}/${ZLIB_DLL_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/
             COMMENT "Copying ${ZLIB_BIN_PATH}/${ZLIB_DLL_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX} to ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/"
         )
-        IF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN")
+        IF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
           ADD_DEPENDENCIES (ZLIB-Dll-Copy ZLIB)
-        ENDIF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN")
+        ENDIF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
       ENDIF (HDF5_PACKAGE_EXTLIBS)
     ENDIF (HDF5_ENABLE_Z_LIB_SUPPORT AND ZLIB_FOUND)
     
@@ -684,18 +700,18 @@ IF (WIN32 AND NOT CYGWIN)
           COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SZIP_BIN_PATH}/${SZIP_DLL_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/
           COMMENT "Copying ${SZIP_BIN_PATH}/${SZIP_DLL_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX} to ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/"
       )
-      IF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN")
+      IF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
         ADD_DEPENDENCIES (SZIP-Release-Copy SZIP)
-      ENDIF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN")
+      ENDIF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
       IF (HDF5_PACKAGE_EXTLIBS)
         SET (EXTERNAL_LIBRARYDLL_LIST ${EXTERNAL_LIBRARYDLL_LIST} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${SZIP_DLL_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
         ADD_CUSTOM_TARGET (SZIP-Dll-Copy ALL
             COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SZIP_BIN_PATH}/${SZIP_DLL_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/
             COMMENT "Copying ${SZIP_BIN_PATH}/${SZIP_DLL_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX} to ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/"
         )
-        IF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN")
+        IF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
           ADD_DEPENDENCIES (SZIP-Dll-Copy SZIP)
-        ENDIF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN")
+        ENDIF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
       ENDIF (HDF5_PACKAGE_EXTLIBS)
     ENDIF (HDF5_ENABLE_SZIP_SUPPORT AND SZIP_FOUND)
     
@@ -732,14 +748,14 @@ ENDIF (HDF5_USE_H5DUMP_PACKED_BITS)
 #-----------------------------------------------------------------------------
 ADD_SUBDIRECTORY (${HDF5_SOURCE_DIR}/src ${PROJECT_BINARY_DIR}/src)
 
-IF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN")
+IF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
   IF (ZLIB_FOUND AND ZLIB_USE_EXTERNAL)
     ADD_DEPENDENCIES (${HDF5_LIB_TARGET} ZLIB)
   ENDIF (ZLIB_FOUND AND ZLIB_USE_EXTERNAL)
   IF (SZIP_FOUND AND SZIP_USE_EXTERNAL)
     ADD_DEPENDENCIES (${HDF5_LIB_TARGET} SZIP)
   ENDIF (SZIP_FOUND AND SZIP_USE_EXTERNAL)
-ENDIF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN")
+ENDIF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
 
 #-----------------------------------------------------------------------------
 # Build utility to copy and strip X lines of file
@@ -1038,6 +1054,7 @@ IF (NOT HDF5_EXTERNALLY_CONFIGURED)
   SET (CPACK_PACKAGE_RELOCATABLE TRUE)
   
   IF (WIN32)
+    SET (CPACK_NSIS_CONTACT "help@hdfgroup.org")
     SET (CPACK_NSIS_MODIFY_PATH ON)
     SET (CPACK_NSIS_PACKAGE_NAME "HDF5 ${HDF5_PACKAGE_VERSION}")
   ELSE (WIN32)
@@ -1045,6 +1062,7 @@ IF (NOT HDF5_EXTERNALLY_CONFIGURED)
   ENDIF (WIN32)
   
   INCLUDE (CPack)
+  INCLUDE(InstallRequiredSystemLibraries)
 
   #---------------------------------------------------------------------------
   # Now list the cpack commands
diff --git a/config/cmake/cacheinit.cmake b/config/cmake/cacheinit.cmake
index 816dd7d..3736b20 100755
--- a/config/cmake/cacheinit.cmake
+++ b/config/cmake/cacheinit.cmake
@@ -40,8 +40,16 @@ SET (HDF5_DISABLE_COMPILER_WARNINGS OFF CACHE BOOL "Disable compiler warnings" F
 

 SET (HDF5_USE_16_API_DEFAULT OFF CACHE BOOL "Use the HDF5 1.6.x API by default" FORCE)

 

-SET (HDF5_ALLOW_EXTERNAL_SUPPORT "NO" CACHE STRING "Allow External Library Building" FORCE)

-

 SET (HDF5_ENABLE_THREADSAFE OFF CACHE BOOL "(WINDOWS)Enable Threadsafety" FORCE)

 

 SET (HDF5_PACKAGE_EXTLIBS OFF CACHE BOOL "(WINDOWS)CPACK - include external libraries" FORCE)

+

+SET (HDF5_ALLOW_EXTERNAL_SUPPORT "NO" CACHE STRING "Allow External Library Building" FORCE)

+

+SET (ZLIB_SVN_URL "http://svn.hdfgroup.uiuc.edu/zlib/trunk" CACHE STRING "Use ZLib from HDF repository" FORCE)

+

+SET (SZIP_SVN_URL "http://svn.hdfgroup.uiuc.edu/szip/trunk" CACHE STRING "Use SZip from HDF repository" FORCE)

+

+SET (ZLIB_TGZ_URL "${HDF5_SOURCE_DIR}/ZLib.tar.gz" CACHE STRING "Use ZLib from compressed file" FORCE)

+

+SET (SZIP_TGZ_URL "${HDF5_SOURCE_DIR}/SZip.tar.gz" CACHE STRING "Use SZip from compressed file" FORCE)

diff --git a/release_docs/CMake.txt b/release_docs/CMake.txt
index 1220066..57cd3fd 100755
--- a/release_docs/CMake.txt
+++ b/release_docs/CMake.txt
@@ -14,15 +14,21 @@ Notes: This short instruction is written for users who want to quickly build
        all the operating systems supported by CMake.
        
        NOTES:
-         1. CMake use is still experimental. While we have attempted to 
-            provide error-free files, please understand that development
-            with CMake has just began. The CMake specific files may change
+         1. Using CMake for building and using HDF5 is under active development. 
+            While we have attempted to provide error-free files, please 
+            understand that development with CMake has not been extensively 
+            tested outside of HDF. The CMake specific files may change
             before the next release.
             
-         2. CMake has been introduced to support development on Windows, however
-            it should be usuable on any system where CMake is supported. Please
-            send us any comments on how CMake support can be improved on any
-            system.
+         2. CMake was originally introduced to support development on Windows, 
+            however it should be usable on any system where CMake is supported. 
+            Please send us any comments on how CMake support can be improved on 
+            any system. Visit the KitWare site for more information about CMake.
+            
+         3. Build and test results can be submitted to our CDash server at:
+            www.cdash.hdfgroup.org. 
+            Please read the HDF and CDash document at:
+            www.hdfgroup.org/CDash/HowToSubmit. 
             
 
 ========================================================================
@@ -32,10 +38,25 @@ Notes: This short instruction is written for users who want to quickly build
    1. We suggest you obtain the latest CMake for windows from the Kitware
       web site. The HDF5 1.8.x product requires CMake version 2.8.2.                     
                                                                          
-   2. If you plan to use Zlib or Szip, download the packages and install them
-      in a central location. For example on Windows, create a folder extlibs 
-      and install the packages there. Windows users should also read Section V
-      in INSTALL_Windows.txt.                           
+   2. If you plan to use Zlib or Szip;
+      A. Download the packages and install them
+         in a central location. For example on Windows, create a folder extlibs 
+         and install the packages there. Windows users should also read Section V
+         in INSTALL_Windows.txt.
+      B. Use source packages from a SVN server by adding the following CMake 
+         options:
+            HDF5_ALLOW_EXTERNAL_SUPPORT:STRING="SVN"
+            ZLIB_SVN_URL:STRING="http://some_location/zlib/trunk"
+            SZIP_SVN_URL:STRING="http://some_location/szip/trunk"
+         where "some_location" is the URL to the SVN repository.
+      C. Use source packages from a compressed file by adding the following CMake 
+         options:
+            HDF5_ALLOW_EXTERNAL_SUPPORT:STRING="TGZ"
+            ZLIB_TGZ_URL:STRING="some_location/zlib_src.ext"
+            SZIP_TGZ_URL:STRING="some_location/szip_src.ext"
+         where "some_location" is the URL or full path to the compressed file and 
+         ext is the type of compression file.
+                                    
                                                                          
 ========================================================================
           Building HDF5 C/C++ Libraries with CMake
@@ -147,15 +168,29 @@ Notes: This short instruction is written for users who want to quickly build
            file in your build directory. Be sure to select either Debug or 
            Release and build the solution.
              
-      3.2  The external libraries (zlib, szip, and jpeg) can be configured
+      3.2.1  The external libraries (zlib, szip, and jpeg) can be configured
            to allow building the libraries by downloading from a SVN repository.
            The option is 'HDF5_ALLOW_EXTERNAL_SUPPORT'; by adding the following
            configuration option:
                -DHDF5_ALLOW_EXTERNAL_SUPPORT:STRING="SVN"
                
-           The options to control the SVN URL are by defualt:
+           The options to control the SVN URL (config/cmake/cacheinit.cmake file):
                ZLIB_SVN_URL:STRING="http://svn.hdfgroup.uiuc.edu/zlib/trunk"
                SZIP_SVN_URL:STRING="http://svn.hdfgroup.uiuc.edu/szip/trunk"
+           These should be changed to your location.
+           
+      3.2.2  Or the external libraries (zlib, szip, and jpeg) can be configured
+           to allow building the libraries by using a compressed file.
+           The option is 'HDF5_ALLOW_EXTERNAL_SUPPORT'; by adding the following
+           configuration option:
+               -DHDF5_ALLOW_EXTERNAL_SUPPORT:STRING="TGZ"
+               
+           The options to control the SVN URL (config/cmake/cacheinit.cmake file):
+               ZLIB_TGZ_URL:STRING="some_location/zlib_src.ext"
+               SZIP_TGZ_URL:STRING="some_location/szip_src.ext"
+            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 like:
+               .bz2, .tar, .tar.gz, .tgz, .zip
 
    4. Test HDF5.
 
@@ -172,7 +207,7 @@ Notes: This short instruction is written for users who want to quickly build
       To package the build into a simple installer using the NullSoft installer NSIS
       on Windows, or into compressed files (.tar.gz, .sh, .zip), use the CPack tool.
 
-      To pacakage the build, navigate to your build directory and execute;
+      To package the build, navigate to your build directory and execute;
       
               cpack -C {Debug | Release} CPackConfig.cmake