diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2014-11-21 04:51:01 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2014-11-21 04:51:01 (GMT) |
| commit | edc91e4e9d33e133f8394a16c011469ac6df6df0 (patch) | |
| tree | b8ec8d40b3dfb830f618f83abd8db668d6cbdf2e | |
| parent | 91561b4999687b599c61db014f87fa460fc4252e (diff) | |
| download | hdf5-edc91e4e9d33e133f8394a16c011469ac6df6df0.zip hdf5-edc91e4e9d33e133f8394a16c011469ac6df6df0.tar.gz hdf5-edc91e4e9d33e133f8394a16c011469ac6df6df0.tar.bz2 | |
[svn-r25830] Merge of r25605 from the win32_dialog_fix feature branch.
Minor changes to CMake files that allow setting library Subversion externals paths via the CMake GUI. By default, these paths are set to our library trunks. We might want to change this on release.
Tested on: 64-bit Windows 7 with Visual Studio 2012 and CMake 3.0.2
| -rw-r--r-- | CMakeFilters.cmake | 8 | ||||
| -rw-r--r-- | CMakeLists.txt | 3 |
2 files changed, 9 insertions, 2 deletions
diff --git a/CMakeFilters.cmake b/CMakeFilters.cmake index f52b99b..a763b09 100644 --- a/CMakeFilters.cmake +++ b/CMakeFilters.cmake @@ -11,6 +11,10 @@ MACRO (HDF5_SETUP_FILTERS FILTER) # message (STATUS "Filter ${FILTER} is ${HDF5_USE_FILTER_${FILTER}}") ENDMACRO (HDF5_SETUP_FILTERS) +# Default Subversion URLs point to our repositories +set (ZLIB_SVN_URL "https://svn.hdfgroup.uiuc.edu/zlib/trunk") +set (SZIP_SVN_URL "https://svn.hdfgroup.uiuc.edu/szip/trunk") + HDF5_SETUP_FILTERS (SHUFFLE) HDF5_SETUP_FILTERS (FLETCHER32) HDF5_SETUP_FILTERS (NBIT) @@ -24,8 +28,8 @@ if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MAT option (ZLIB_USE_EXTERNAL "Use External Library Building for ZLIB" 1) option (SZIP_USE_EXTERNAL "Use External Library Building for SZIP" 1) if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN") - set (ZLIB_URL ${ZLIB_SVN_URL}) - set (SZIP_URL ${SZIP_SVN_URL}) + 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") elseif (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ") if (NOT TGZPATH) set (TGZPATH ${HDF5_SOURCE_DIR}) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8b8d5c7..09d886b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -675,6 +675,9 @@ endif (HDF5_USE_16_API_DEFAULT) #----------------------------------------------------------------------------- include (UserMacros.cmake) +#----------------------------------------------------------------------------- +# Include filter (zlib, szip, etc.) macros +#----------------------------------------------------------------------------- include (CMakeFilters.cmake) #----------------------------------------------------------------------------- |