philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[svn-r25830] Merge of r25605 from the win32_dialog_fix feature branch.

Browse Source 
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
This commit is contained in:
Dana Robinson
2014-11-20 23:51:01 -05:00
parent 91561b4999
commit edc91e4e9d
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeFilters.cmake
View File

@@ -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})

3
CMakeLists.txt
View File

@@ -675,6 +675,9 @@ endif (HDF5_USE_16_API_DEFAULT)
#-----------------------------------------------------------------------------
include (UserMacros.cmake)
#-----------------------------------------------------------------------------
# Include filter (zlib, szip, etc.) macros
#-----------------------------------------------------------------------------
include (CMakeFilters.cmake)
#-----------------------------------------------------------------------------