summaryrefslogtreecommitdiffstats
path: root/CMakeFilters.cmake
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2016-10-10 18:35:20 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2016-10-10 18:35:29 (GMT)
commitb00920b338a35147556591ced6e4a44b81ce7187 (patch)
treead86e7a4fccb730e999faca2ab011501ae5d5a58 /CMakeFilters.cmake
parent8b4633e99d6e447327526663acd30352b5840446 (diff)
downloadhdf5-b00920b338a35147556591ced6e4a44b81ce7187.zip
hdf5-b00920b338a35147556591ced6e4a44b81ce7187.tar.gz
hdf5-b00920b338a35147556591ced6e4a44b81ce7187.tar.bz2
HDFFV-9961: Merge GIT ext lib option to 1.8
Diffstat (limited to 'CMakeFilters.cmake')
-rw-r--r--CMakeFilters.cmake2
1 files changed, 2 insertions, 0 deletions
diff --git a/CMakeFilters.cmake b/CMakeFilters.cmake
index bb0d238..b7aa77d 100644
--- a/CMakeFilters.cmake
+++ b/CMakeFilters.cmake
@@ -8,7 +8,9 @@ if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MAT
option (SZIP_USE_EXTERNAL "Use External Library Building for SZIP" 1)
if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT")
set (ZLIB_URL ${ZLIB_GIT_URL} CACHE STRING "Path to zlib git repository")
+ set (ZLIB_BRANCH ${ZLIB_GIT_BRANCH})
set (SZIP_URL ${SZIP_GIT_URL} CACHE STRING "Path to szip git repository")
+ set (SZIP_BRANCH ${SZIP_GIT_BRANCH})
elseif (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN")
set (ZLIB_URL ${ZLIB_SVN_URL} CACHE STRING "Path to zlib Subversion repository")
set (SZIP_URL ${SZIP_SVN_URL} CACHE STRING "Path to szip Subversion repository")