[svn-r19993] Added ability to use compressed file for external libraries corrected.

Tested: local linux

3 files changed, 15 insertions, 6 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3b0b696..f6fb8fb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -441,6 +441,13 @@ OPTION (SZIP_USE_EXTERNAL "Use External Library Building for SZIP" 0)
 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 (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
+    IF (NOT TGZ_PATH})
+      SET (TGZ_PATH ${HDF5_SOURCE_DIR})
+    ENDIF (NOT TGZ_PATH})
+    SET (ZLIB_TGZ_URL ${TGZ_PATH}/${ZLIB_TGZ_NAME})
+    SET (SZIP_TGZ_URL ${TGZ_PATH}/${SZIP_TGZ_NAME})
+  ENDIF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
 ENDIF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
 
 #-----------------------------------------------------------------------------
diff --git a/config/cmake/cacheinit.cmake b/config/cmake/cacheinit.cmake
index 3736b20..3375c2b 100755
--- a/config/cmake/cacheinit.cmake
+++ b/config/cmake/cacheinit.cmake
@@ -50,6 +50,6 @@ SET (ZLIB_SVN_URL "http://svn.hdfgroup.uiuc.edu/zlib/trunk" CACHE STRING "Use ZL
 

 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 (ZLIB_TGZ_NAME "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)

+SET (SZIP_TGZ_NAME "SZip.tar.gz" CACHE STRING "Use SZip from compressed file" FORCE)

diff --git a/release_docs/CMake.txt b/release_docs/CMake.txt
index 57cd3fd..f882d7f 100755
--- a/release_docs/CMake.txt
+++ b/release_docs/CMake.txt
@@ -52,8 +52,9 @@ Notes: This short instruction is written for users who want to quickly build
       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"
+            ZLIB_TGZ_NAME:STRING="zlib_src.ext"
+            SZIP_TGZ_NAME:STRING="szip_src.ext"
+            TGZ_PATH:STRING="some_location"
          where "some_location" is the URL or full path to the compressed file and 
          ext is the type of compression file.
                                     
@@ -186,8 +187,9 @@ Notes: This short instruction is written for users who want to quickly build
                -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"
+               ZLIB_TGZ_NAME:STRING="zlib_src.ext"
+               SZIP_TGZ_NAME:STRING="szip_src.ext"
+               TGZ_PATH: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 like:
                .bz2, .tar, .tar.gz, .tgz, .zip