diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2011-02-25 14:30:43 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2011-02-25 14:30:43 (GMT) |
| commit | b36793344fdcf94f7aedad336e7ef160b05fe5f7 (patch) | |
| tree | d07fb65f2f0decc99df2326350c3afec4cb6276c | |
| parent | 251a65e448975121d51d4f2a09750237bbf4209d (diff) | |
| download | hdf5-b36793344fdcf94f7aedad336e7ef160b05fe5f7.zip hdf5-b36793344fdcf94f7aedad336e7ef160b05fe5f7.tar.gz hdf5-b36793344fdcf94f7aedad336e7ef160b05fe5f7.tar.bz2 | |
[svn-r20156] Update macros to correct errors found on windows
| -rw-r--r-- | config/cmake/HDFMacros.cmake | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/config/cmake/HDFMacros.cmake b/config/cmake/HDFMacros.cmake index 954713e..4adc455 100644 --- a/config/cmake/HDFMacros.cmake +++ b/config/cmake/HDFMacros.cmake @@ -62,7 +62,7 @@ ENDMACRO (PACKAGE_JPEG_LIBRARY) MACRO (EXTERNAL_SZIP_LIBRARY compress_type libtype encoding) IF (${compress_type} MATCHES "SVN") EXTERNALPROJECT_ADD (SZIP - SVN_REPOSITORY ${SZIP_SVN_URL} + SVN_REPOSITORY ${SZIP_URL} # [SVN_REVISION rev] INSTALL_COMMAND "" CMAKE_ARGS @@ -71,7 +71,7 @@ MACRO (EXTERNAL_SZIP_LIBRARY compress_type libtype encoding) ) ELSEIF (${compress_type} MATCHES "TGZ") EXTERNALPROJECT_ADD (SZIP - URL ${SZIP_SVN_URL} + URL ${SZIP_URL} URL_MD5 "" INSTALL_COMMAND "" CMAKE_ARGS @@ -116,6 +116,10 @@ MACRO (PACKAGE_SZIP_LIBRARY compress_type libtype) ENDIF (${compress_type} MATCHES "SVN" OR ${compress_type} MATCHES "TGZ") IF (WIN32 AND NOT CYGWIN) IF (${libtype} MATCHES "SHARED") + GET_FILENAME_COMPONENT(SZIP_DLL_NAME ${SZIP_LIBRARY} NAME_WE) + # MESSAGE (STATUS "SZIP_DLL_NAME: ${SZIP_DLL_NAME}") + GET_FILENAME_COMPONENT(SZIP_BIN_PATH ${SZIP_LIBRARY} PATH) + # MESSAGE (STATUS "SZIP_BIN_PATH: ${SZIP_BIN_PATH}") SET (EXTERNAL_LIBRARYDLL_LIST ${EXTERNAL_LIBRARYDLL_LIST} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${SZIP_DLL_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}) ADD_CUSTOM_TARGET (SZIP-Dll-Copy ALL COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SZIP_BIN_PATH}/${SZIP_DLL_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ @@ -194,6 +198,10 @@ MACRO (PACKAGE_ZLIB_LIBRARY compress_type libtype) ENDIF (${compress_type} MATCHES "SVN" OR ${compress_type} MATCHES "TGZ") IF (WIN32 AND NOT CYGWIN) IF (${libtype} MATCHES "SHARED") + GET_FILENAME_COMPONENT(ZLIB_DLL_NAME ${ZLIB_LIBRARY} NAME_WE) + # MESSAGE (STATUS "ZLIB_DLL_NAME: ${ZLIB_DLL_NAME}") + GET_FILENAME_COMPONENT(ZLIB_BIN_PATH ${ZLIB_LIBRARY} PATH) + # MESSAGE (STATUS "ZLIB_BIN_PATH: ${ZLIB_BIN_PATH}") SET (EXTERNAL_LIBRARYDLL_LIST ${EXTERNAL_LIBRARYDLL_LIST} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${ZLIB_DLL_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}) ADD_CUSTOM_TARGET (ZLIB-Dll-Copy ALL COMMAND ${CMAKE_COMMAND} -E copy_if_different ${ZLIB_BIN_PATH}/${ZLIB_DLL_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ |