diff options
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | config/cmake/HDFMacros.cmake | 18 |
2 files changed, 11 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 998b5b0..1d102bb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -487,7 +487,7 @@ IF (HDF5_ENABLE_Z_LIB_SUPPORT) SET (ZLIB_INCLUDE_DIR_GEN ${ZLIB_INCLUDE_DIR}) ELSE (ZLIB_FOUND) IF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ") - EXTERNAL_ZLIB_LIBRARY (${HDF5_ALLOW_EXTERNAL_SUPPORT} ${ZLIB_URL} ${LIB_TYPE}) + EXTERNAL_ZLIB_LIBRARY (${HDF5_ALLOW_EXTERNAL_SUPPORT} ${LIB_TYPE}) SET (H5_HAVE_FILTER_DEFLATE 1) SET (H5_HAVE_ZLIB_H 1) SET (H5_HAVE_LIBZ 1) @@ -524,7 +524,7 @@ IF (HDF5_ENABLE_SZIP_SUPPORT) SET (SZIP_INCLUDE_DIR_GEN ${SZIP_INCLUDE_DIR}) ELSE (SZIP_FOUND) IF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ") - EXTERNAL_SZIP_LIBRARY (${HDF5_ALLOW_EXTERNAL_SUPPORT} ${SZIP_URL} ${LIB_TYPE} ${HDF5_ENABLE_SZIP_ENCODING}) + EXTERNAL_SZIP_LIBRARY (${HDF5_ALLOW_EXTERNAL_SUPPORT} ${LIB_TYPE} ${HDF5_ENABLE_SZIP_ENCODING}) SET (H5_HAVE_FILTER_SZIP 1) SET (H5_HAVE_SZLIB_H 1) SET (H5_HAVE_LIBSZ 1) diff --git a/config/cmake/HDFMacros.cmake b/config/cmake/HDFMacros.cmake index 045d5f0..954713e 100644 --- a/config/cmake/HDFMacros.cmake +++ b/config/cmake/HDFMacros.cmake @@ -4,13 +4,13 @@ MACRO (SET_GLOBAL_VARIABLE name value) ENDMACRO (SET_GLOBAL_VARIABLE) #------------------------------------------------------------------------------- -MACRO (EXTERNAL_JPEG_LIBRARY compress_type lib_url jpeg_pic) +MACRO (EXTERNAL_JPEG_LIBRARY compress_type jpeg_pic) # May need to build JPEG with PIC on x64 machines with gcc # Need to use CMAKE_ANSI_CFLAGS define so that compiler test works IF (${compress_type} MATCHES "SVN") EXTERNALPROJECT_ADD (JPEG - SVN_REPOSITORY ${lib_url} + SVN_REPOSITORY ${JPEG_URL} # [SVN_REVISION rev] INSTALL_COMMAND "" CMAKE_ARGS @@ -20,7 +20,7 @@ MACRO (EXTERNAL_JPEG_LIBRARY compress_type lib_url jpeg_pic) ) ELSEIF (${compress_type} MATCHES "TGZ") EXTERNALPROJECT_ADD (JPEG - URL ${lib_url} + URL ${JPEG_URL} URL_MD5 "" INSTALL_COMMAND "" CMAKE_ARGS @@ -59,10 +59,10 @@ MACRO (PACKAGE_JPEG_LIBRARY compress_type) ENDMACRO (PACKAGE_JPEG_LIBRARY) #------------------------------------------------------------------------------- -MACRO (EXTERNAL_SZIP_LIBRARY compress_type lib_url libtype encoding) +MACRO (EXTERNAL_SZIP_LIBRARY compress_type libtype encoding) IF (${compress_type} MATCHES "SVN") EXTERNALPROJECT_ADD (SZIP - SVN_REPOSITORY ${lib_url} + SVN_REPOSITORY ${SZIP_SVN_URL} # [SVN_REVISION rev] INSTALL_COMMAND "" CMAKE_ARGS @@ -71,7 +71,7 @@ MACRO (EXTERNAL_SZIP_LIBRARY compress_type lib_url libtype encoding) ) ELSEIF (${compress_type} MATCHES "TGZ") EXTERNALPROJECT_ADD (SZIP - URL ${lib_url} + URL ${SZIP_SVN_URL} URL_MD5 "" INSTALL_COMMAND "" CMAKE_ARGS @@ -129,10 +129,10 @@ MACRO (PACKAGE_SZIP_LIBRARY compress_type libtype) ENDMACRO (PACKAGE_SZIP_LIBRARY) #------------------------------------------------------------------------------- -MACRO (EXTERNAL_ZLIB_LIBRARY compress_type lib_url libtype) +MACRO (EXTERNAL_ZLIB_LIBRARY compress_type libtype) IF (${compress_type} MATCHES "SVN") EXTERNALPROJECT_ADD (ZLIB - SVN_REPOSITORY ${lib_url} + SVN_REPOSITORY ${ZLIB_URL} # [SVN_REVISION rev] INSTALL_COMMAND "" CMAKE_ARGS @@ -141,7 +141,7 @@ MACRO (EXTERNAL_ZLIB_LIBRARY compress_type lib_url libtype) ) ELSEIF (${compress_type} MATCHES "TGZ") EXTERNALPROJECT_ADD (ZLIB - URL ${lib_url} + URL ${ZLIB_URL} URL_MD5 "" INSTALL_COMMAND "" CMAKE_ARGS |