diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2013-12-02 20:46:37 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2013-12-02 20:46:37 (GMT) |
| commit | 99a54a3056f40494986a2510d1f8257cfb2a7308 (patch) | |
| tree | 98168654281062d0b37d23d83450782630401d2a | |
| parent | 624a4666003c8214be250d7153471fa593906f21 (diff) | |
| download | hdf5-99a54a3056f40494986a2510d1f8257cfb2a7308.zip hdf5-99a54a3056f40494986a2510d1f8257cfb2a7308.tar.gz hdf5-99a54a3056f40494986a2510d1f8257cfb2a7308.tar.bz2 | |
[svn-r24483] Commit change from 1.8.12 src patch
| -rw-r--r-- | CMakeInstallation.cmake | 38 |
1 files changed, 21 insertions, 17 deletions
diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake index 1a4c2fa..ad8f0ef 100644 --- a/CMakeInstallation.cmake +++ b/CMakeInstallation.cmake @@ -230,23 +230,27 @@ IF (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES) SET (CPACK_PACKAGE_ICON "${HDF5_RESOURCES_DIR}/hdf.gif") SET (CPACK_SET_DESTDIR TRUE) # Required when packaging, and set CMAKE_INSTALL_PREFIX to "/". -# LIST (APPEND CPACK_GENERATOR "Bundle") - SET (CPACK_BUNDLE_NAME "${HDF5_PACKAGE_STRING}") - SET (CPACK_BUNDLE_LOCATION "/") # make sure CMAKE_INSTALL_PREFIX ends in / - SET (CMAKE_INSTALL_PREFIX "/${CPACK_BUNDLE_NAME}.framework/Versions/${CPACK_PACKAGE_VERSION}/${CPACK_PACKAGE_NAME}/") - SET (CPACK_BUNDLE_ICON "${HDF5_RESOURCES_DIR}/hdf.gif") - SET (CPACK_BUNDLE_PLIST "${HDF5_BINARY_DIR}/CMakeFiles/Info.plist") -# SET (CPACK_BUNDLE_STARTUP_COMMAND "${HDF5_BINARY_DIR}/CMakeFiles/${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-startup.sh") - SET (CPACK_APPLE_GUI_INFO_STRING "HDF5 (Hierarchical Data Format 5) Software Library and Utilities") - SET (CPACK_APPLE_GUI_COPYRIGHT "Copyright © 2006-2013 by The HDF Group. All rights reserved.") - SET (CPACK_SHORT_VERSION_STRING "${CPACK_PACKAGE_VERSION}") - #----------------------------------------------------------------------------- - # Configure the Info.plist file for the install bundle - #----------------------------------------------------------------------------- - CONFIGURE_FILE ( - ${HDF5_RESOURCES_DIR}/CPack.Info.plist.in - ${HDF5_BINARY_DIR}/CMakeFiles/Info.plist @ONLY - ) + IF (HDF5_PACK_MACOSX_BUNDLE) + LIST (APPEND CPACK_GENERATOR "Bundle") + SET (CPACK_BUNDLE_NAME "${HDF5_PACKAGE_STRING}") + SET (CPACK_BUNDLE_LOCATION "/") # make sure CMAKE_INSTALL_PREFIX ends in / + IF(NOT DEFINED CMAKE_INSTALL_PREFIX) + SET (CMAKE_INSTALL_PREFIX "/${CPACK_BUNDLE_NAME}.framework/Versions/${CPACK_PACKAGE_VERSION}/${CPACK_PACKAGE_NAME}/") + ENDIF(NOT DEFINED CMAKE_INSTALL_PREFIX) + SET (CPACK_BUNDLE_ICON "${HDF5_RESOURCES_DIR}/hdf.gif") + SET (CPACK_BUNDLE_PLIST "${HDF5_BINARY_DIR}/CMakeFiles/Info.plist") +# SET (CPACK_BUNDLE_STARTUP_COMMAND "${HDF5_BINARY_DIR}/CMakeFiles/${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-startup.sh") + SET (CPACK_APPLE_GUI_INFO_STRING "HDF5 (Hierarchical Data Format 5) Software Library and Utilities") + SET (CPACK_APPLE_GUI_COPYRIGHT "Copyright © 2006-2013 by The HDF Group. All rights reserved.") + SET (CPACK_SHORT_VERSION_STRING "${CPACK_PACKAGE_VERSION}") + #----------------------------------------------------------------------------- + # Configure the Info.plist file for the install bundle + #----------------------------------------------------------------------------- + CONFIGURE_FILE ( + ${HDF5_RESOURCES_DIR}/CPack.Info.plist.in + ${HDF5_BINARY_DIR}/CMakeFiles/Info.plist @ONLY + ) + ENDIF(HDF5_PACK_MACOSX_BUNDLE) ELSE (WIN32) LIST (APPEND CPACK_GENERATOR "STGZ") SET (CPACK_PACKAGING_INSTALL_PREFIX "/usr") |