diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2010-10-11 15:11:46 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2010-10-11 15:11:46 (GMT) |
| commit | 91029a6dba4f962dafd9520a0a6dafcbc374919e (patch) | |
| tree | 5bc1817ea7e867e0fb94961cb6a667f7f0caac79 | |
| parent | ef168eb0d83481fe10cbdf1e6ffa8c90eab6f07e (diff) | |
| download | hdf5-91029a6dba4f962dafd9520a0a6dafcbc374919e.zip hdf5-91029a6dba4f962dafd9520a0a6dafcbc374919e.tar.gz hdf5-91029a6dba4f962dafd9520a0a6dafcbc374919e.tar.bz2 | |
[svn-r19570] Parameterize SVN URLs.
Add ExternalProject dependicies of external libs copy on project build.
Force ExternalProject Libs to build release.
Tested: local linux
| -rw-r--r-- | CMakeLists.txt | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 49a4d5f..a876f7b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -445,6 +445,14 @@ HDF5_SETUP_FILTERS (SCALEOFFSET) INCLUDE (ExternalProject) OPTION (HDF5_ALLOW_EXTERNAL_SUPPORT "Allow External Library Building" "NO") +IF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN") + IF (NOT ZLIB_SVN_URL) + SET (ZLIB_SVN_URL "http://svn.hdfgroup.uiuc.edu/zlib/trunk") + ENDIF (NOT ZLIB_SVN_URL) + IF (NOT SZIP_SVN_URL) + SET (SZIP_SVN_URL "http://svn.hdfgroup.uiuc.edu/szip/trunk") + ENDIF (NOT SZIP_SVN_URL) +ENDIF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN") #----------------------------------------------------------------------------- # Option for ZLib support @@ -461,10 +469,11 @@ IF (HDF5_ENABLE_Z_LIB_SUPPORT) ELSE (ZLIB_FOUND) IF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN") EXTERNALPROJECT_ADD (ZLIB - SVN_REPOSITORY http://svn.hdfgroup.uiuc.edu/zlib/trunk + SVN_REPOSITORY ${ZLIB_SVN_URL} # [SVN_REVISION rev] INSTALL_COMMAND "" CMAKE_ARGS + -DBLDTYPE:STRING="Release" -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS} ) EXTERNALPROJECT_GET_PROPERTY (ZLIB BINARY_DIR SOURCE_DIR) @@ -521,10 +530,11 @@ IF (HDF5_ENABLE_SZIP_SUPPORT) ELSE (SZIP_FOUND) IF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN") EXTERNALPROJECT_ADD (SZIP - SVN_REPOSITORY http://svn.hdfgroup.uiuc.edu/szip/trunk + SVN_REPOSITORY ${SZIP_SVN_URL} # [SVN_REVISION rev] INSTALL_COMMAND "" CMAKE_ARGS + -DBLDTYPE:STRING="Release" -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS} -DSZIP_ENABLE_ENCODING:BOOL=${HDF5_ENABLE_SZIP_ENCODING} ) @@ -582,6 +592,9 @@ IF (WIN32 AND NOT CYGWIN) COMMAND ${CMAKE_COMMAND} -E copy_if_different ${ZLIB_BIN_PATH}/${ZLIB_DLL_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/ COMMENT "Copying ${ZLIB_BIN_PATH}/${ZLIB_DLL_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX} to ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/" ) + IF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN") + ADD_DEPENDENCIES (${ZLIB-Release-Copy} ZLIB) + ENDIF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN") ENDIF (HDF5_ENABLE_Z_LIB_SUPPORT AND ZLIB_FOUND) IF (HDF5_ENABLE_SZIP_SUPPORT AND SZIP_FOUND) @@ -593,6 +606,9 @@ IF (WIN32 AND NOT CYGWIN) COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SZIP_BIN_PATH}/${SZIP_DLL_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/ COMMENT "Copying ${SZIP_BIN_PATH}/${SZIP_DLL_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX} to ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/" ) + IF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN") + ADD_DEPENDENCIES (${SZIP-Release-Copy} SZIP) + ENDIF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN") ENDIF (HDF5_ENABLE_SZIP_SUPPORT AND SZIP_FOUND) ENDIF (BUILD_SHARED_LIBS) |