diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2011-05-04 16:18:22 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2011-05-04 16:18:22 (GMT) |
| commit | ece690cdb66a1d116f557fca4f5bf5800e4bc522 (patch) | |
| tree | 0e5096d79cf25d6d1d0e6e6e1c853222f7b56eee /CMakeLists.txt | |
| parent | 82e9f2291208be85acc299839e717b5f5b620ec8 (diff) | |
| download | hdf5-ece690cdb66a1d116f557fca4f5bf5800e4bc522.zip hdf5-ece690cdb66a1d116f557fca4f5bf5800e4bc522.tar.gz hdf5-ece690cdb66a1d116f557fca4f5bf5800e4bc522.tar.bz2 | |
[svn-r20717] Refactor ext lib import and install.
Change case of tools subtests to not conflict with tools tests.
Tested: windows, local linux
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 46 |
1 files changed, 33 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b68d79..13c0df4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -514,7 +514,6 @@ ENDIF (HDF5_ENABLE_Z_LIB_SUPPORT) #----------------------------------------------------------------------------- # Option for SzLib support #----------------------------------------------------------------------------- -SET (CMAKE_MODULE_PATH ${HDF5_RESOURCES_DIR} ${CMAKE_MODULE_PATH}) OPTION (HDF5_ENABLE_SZIP_SUPPORT "Use SZip Filter" OFF) IF (HDF5_ENABLE_SZIP_SUPPORT) OPTION (HDF5_ENABLE_SZIP_ENCODING "Use SZip Encoding" OFF) @@ -727,12 +726,31 @@ ENDIF (NOT HDF5_INSTALL_NO_DEVELOPMENT) #----------------------------------------------------------------------------- IF (NOT HDF5_EXTERNALLY_CONFIGURED) IF (HDF5_PACKAGE_EXTLIBS) + IF (WIN32 AND BUILD_SHARED_LIBS) + SET (HDF5_INSTALL_EXTLIB_DIR ${HDF5_INSTALL_BIN_DIR}) + ELSE (WIN32 AND BUILD_SHARED_LIBS) + SET (HDF5_INSTALL_EXTLIB_DIR ${HDF5_INSTALL_LIB_DIR}) + ENDIF (WIN32 AND BUILD_SHARED_LIBS) IF (HDF5_ENABLE_Z_LIB_SUPPORT AND ZLIB_FOUND) INSTALL ( FILES ${ZLIB_INCLUDE_DIR}/zlib.h DESTINATION ${HDF5_INSTALL_INCLUDE_DIR} COMPONENT headers ) + GET_PROPERTY (ZLIB_LIB TARGET ${ZLIB_LIBRARY} PROPERTY LOCATION_${BLDTYPE}) + INSTALL( + FILES ${ZLIB_LIB} + DESTINATION ${HDF5_INSTALL_EXTLIB_DIR} + COMPONENT libraries + ) + IF (WIN32 AND BUILD_SHARED_LIBS) + GET_PROPERTY (ZLIB_IMPLIB TARGET ${ZLIB_LIBRARY} PROPERTY IMPORTLIBRARY_${BLDTYPE}) + INSTALL( + FILES ${ZLIB_IMPLIB} + DESTINATION ${HDF5_INSTALL_LIB_DIR} + COMPONENT libraries + ) + ENDIF (WIN32 AND BUILD_SHARED_LIBS) ENDIF (HDF5_ENABLE_Z_LIB_SUPPORT AND ZLIB_FOUND) IF (HDF5_ENABLE_SZIP_SUPPORT AND SZIP_FOUND) INSTALL ( @@ -740,24 +758,26 @@ IF (NOT HDF5_EXTERNALLY_CONFIGURED) DESTINATION ${HDF5_INSTALL_INCLUDE_DIR} COMPONENT headers ) + GET_PROPERTY (SZIP_LIB TARGET ${SZIP_LIBRARY} PROPERTY LOCATION_${BLDTYPE}) + INSTALL( + FILES ${SZIP_LIB} + DESTINATION ${HDF5_INSTALL_EXTLIB_DIR} + COMPONENT libraries + ) + IF (WIN32 AND BUILD_SHARED_LIBS) + GET_PROPERTY (SZIP_IMPLIB TARGET ${SZIP_LIBRARY} PROPERTY IMPORTLIBRARY_${BLDTYPE}) + INSTALL( + FILES ${SZIP_IMPLIB} + DESTINATION ${HDF5_INSTALL_LIB_DIR} + COMPONENT libraries + ) + ENDIF (WIN32 AND BUILD_SHARED_LIBS) ENDIF (HDF5_ENABLE_SZIP_SUPPORT AND SZIP_FOUND) INSTALL ( FILES ${EXTERNAL_HEADER_LIST} DESTINATION ${HDF5_INSTALL_INCLUDE_DIR} COMPONENT headers ) - INSTALL( - FILES ${EXTERNAL_LIBRARY_LIST} - DESTINATION ${HDF5_INSTALL_LIB_DIR} - COMPONENT libraries - ) - IF (WIN32 AND BUILD_SHARED_LIBS) - INSTALL( - FILES ${EXTERNAL_LIBRARYDLL_LIST} - DESTINATION ${HDF5_INSTALL_BIN_DIR} - COMPONENT libraries - ) - ENDIF (WIN32 AND BUILD_SHARED_LIBS) ENDIF (HDF5_PACKAGE_EXTLIBS) ENDIF (NOT HDF5_EXTERNALLY_CONFIGURED) |