diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2010-10-15 15:33:20 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2010-10-15 15:33:20 (GMT) |
| commit | ac4461a25e1dcba51fcb1450f6e28ee95eff1bbc (patch) | |
| tree | 1d8e7b23d66fd29b012bba39b318e935ba8342e2 | |
| parent | 3309c8168cd3a695457ae12d1bcd7f908cb626b6 (diff) | |
| download | hdf5-ac4461a25e1dcba51fcb1450f6e28ee95eff1bbc.zip hdf5-ac4461a25e1dcba51fcb1450f6e28ee95eff1bbc.tar.gz hdf5-ac4461a25e1dcba51fcb1450f6e28ee95eff1bbc.tar.bz2 | |
[svn-r19612] Add missing XXX_USE_EXTERNAL flags for ExternalProjects
| -rw-r--r-- | CMakeLists.txt | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index bbc7f59..e3a7cc9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -448,6 +448,8 @@ HDF5_SETUP_FILTERS (SCALEOFFSET) INCLUDE (ExternalProject) OPTION (HDF5_ALLOW_EXTERNAL_SUPPORT "Allow External Library Building" "NO") IF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN") + 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) @@ -462,7 +464,9 @@ ENDIF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN") OPTION (HDF5_ENABLE_Z_LIB_SUPPORT "Enable Zlib Filters" OFF) IF (HDF5_ENABLE_Z_LIB_SUPPORT) IF (NOT H5_ZLIB_HEADER) - FIND_PACKAGE (ZLIB) + IF (NOT ZLIB_USE_EXTERNAL) + FIND_PACKAGE (ZLIB) + ENDIF (NOT ZLIB_USE_EXTERNAL) IF (ZLIB_FOUND) SET (H5_HAVE_FILTER_DEFLATE 1) SET (H5_HAVE_ZLIB_H 1) @@ -537,7 +541,9 @@ SET (CMAKE_MODULE_PATH ${HDF5_RESOURCES_DIR} ${CMAKE_MODULE_PATH}) OPTION (HDF5_ENABLE_SZIP_SUPPORT "Use SZip Filter" OFF) IF (HDF5_ENABLE_SZIP_SUPPORT) OPTION (HDF5_ENABLE_SZIP_ENCODING "Use SZip Encoding" OFF) - FIND_PACKAGE (SZIP) + IF (NOT SZIP_USE_EXTERNAL) + FIND_PACKAGE (SZIP) + ENDIF (NOT SZIP_USE_EXTERNAL) IF (SZIP_FOUND) SET (H5_HAVE_FILTER_SZIP 1) SET (H5_HAVE_SZLIB_H 1) |