diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2014-01-28 21:25:21 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2014-01-28 21:25:21 (GMT) |
| commit | 256b36e14105ab859e41582a0ab6b8d0a7ec6e83 (patch) | |
| tree | c51a31cf45740f4dd301ee886f7c6c77c9ef64af /CMakeInstallation.cmake | |
| parent | 50bd3521af6fa564d2ad2abfd3eeec49eabdebd5 (diff) | |
| download | hdf5-256b36e14105ab859e41582a0ab6b8d0a7ec6e83.zip hdf5-256b36e14105ab859e41582a0ab6b8d0a7ec6e83.tar.gz hdf5-256b36e14105ab859e41582a0ab6b8d0a7ec6e83.tar.bz2 | |
[svn-r24655] Correct packaging variables and use standard cpack module.
Diffstat (limited to 'CMakeInstallation.cmake')
| -rw-r--r-- | CMakeInstallation.cmake | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake index a0a6f3d..ad6e94e 100644 --- a/CMakeInstallation.cmake +++ b/CMakeInstallation.cmake @@ -215,12 +215,23 @@ IF (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES) SET (CPACK_GENERATOR "TGZ") IF (WIN32) LIST (APPEND CPACK_GENERATOR "NSIS") + # Installers for 32- vs. 64-bit CMake: + # - Root install directory (displayed to end user at installer-run time) + # - "NSIS package/display name" (text used in the installer GUI) + # - Registry key used to store info about the installation + IF (CMAKE_CL_64) + SET (CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES64") + SET (CPACK_NSIS_PACKAGE_NAME "${HDF5_PACKAGE_STRING} (Win64)") + SET (CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${HDF5_PACKAGE_STRING}-${LIB_TYPE} (Win64)") + ELSE (CMAKE_CL_64) + SET (CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES") + SET (CPACK_NSIS_PACKAGE_NAME "${HDF5_PACKAGE_STRING}") + SET (CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${HDF5_PACKAGE_STRING}-${LIB_TYPE}") + ENDIF (CMAKE_CL_64) SET (CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_VENDOR}\\\\${CPACK_PACKAGE_NAME}\\\\${CPACK_PACKAGE_VERSION}") - SET (CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${LIB_TYPE}") SET (CPACK_MONOLITHIC_INSTALL ON) SET (CPACK_NSIS_CONTACT "${HDF5_PACKAGE_BUGREPORT}") SET (CPACK_NSIS_MODIFY_PATH ON) - SET (CPACK_NSIS_PACKAGE_NAME "HDF5 ${CPACK_PACKAGE_VERSION}") ELSEIF (APPLE) LIST (APPEND CPACK_GENERATOR "DragNDrop") SET (CPACK_COMPONENTS_ALL_IN_ONE_PACKAGE ON) |