summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CMakeFilters.cmake10
-rw-r--r--release_docs/INSTALL_CMake.txt4
2 files changed, 7 insertions, 7 deletions
diff --git a/CMakeFilters.cmake b/CMakeFilters.cmake
index 01594d0..bc78fa6 100644
--- a/CMakeFilters.cmake
+++ b/CMakeFilters.cmake
@@ -25,11 +25,11 @@ IF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MAT
SET (ZLIB_URL ${ZLIB_SVN_URL})
SET (SZIP_URL ${SZIP_SVN_URL})
ELSEIF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
- IF (NOT TGZ_PATH)
- SET (TGZ_PATH ${HDF5_SOURCE_DIR})
- ENDIF (NOT TGZ_PATH)
- SET (ZLIB_URL ${TGZ_PATH}/${ZLIB_TGZ_NAME})
- SET (SZIP_URL ${TGZ_PATH}/${SZIP_TGZ_NAME})
+ IF (NOT TGZPATH)
+ SET (TGZPATH ${HDF5_SOURCE_DIR})
+ ENDIF (NOT TGZPATH)
+ SET (ZLIB_URL ${TGZPATH}/${ZLIB_TGZ_NAME})
+ SET (SZIP_URL ${TGZPATH}/${SZIP_TGZ_NAME})
ELSE (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN")
SET (ZLIB_USE_EXTERNAL 0)
SET (SZIP_USE_EXTERNAL 0)
diff --git a/release_docs/INSTALL_CMake.txt b/release_docs/INSTALL_CMake.txt
index 95ebec9..5594610 100644
--- a/release_docs/INSTALL_CMake.txt
+++ b/release_docs/INSTALL_CMake.txt
@@ -102,7 +102,7 @@ II. Preconditions
HDF5_ALLOW_EXTERNAL_SUPPORT:STRING="TGZ"
ZLIB_TGZ_NAME:STRING="zlib_src.ext"
SZIP_TGZ_NAME:STRING="szip_src.ext"
- TGZ_PATH:STRING="some_location"
+ TGZPATH:STRING="some_location"
where "some_location" is the URL or full path to the compressed
file and ext is the type of compression file.
@@ -327,7 +327,7 @@ These five steps are described in detail below.
file) are:
ZLIB_TGZ_NAME:STRING="zlib_src.ext"
SZIP_TGZ_NAME:STRING="szip_src.ext"
- TGZ_PATH:STRING="some_location"
+ TGZPATH: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 such as .bz2, .tar, .tar.gz, .tgz, or .zip.