diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2014-02-03 21:59:26 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2014-02-03 21:59:26 (GMT) |
| commit | ea30f2156b29d7754eae6a58e8824f121f5e2d39 (patch) | |
| tree | a5ebdf8f8e8e574fb923aba08f8ace225cdd6fef /CMakeInstallation.cmake | |
| parent | 960dbc91698709e532d4cab06ef653f175fb57d0 (diff) | |
| download | hdf5-ea30f2156b29d7754eae6a58e8824f121f5e2d39.zip hdf5-ea30f2156b29d7754eae6a58e8824f121f5e2d39.tar.gz hdf5-ea30f2156b29d7754eae6a58e8824f121f5e2d39.tar.bz2 | |
[svn-r24680] Remove acknowledgment file from install.
Remove obsolete CPack.cmake file.
Merge h5repack and h5mkgrp test folder changes from trunk.
Tested: local linux
Diffstat (limited to 'CMakeInstallation.cmake')
| -rw-r--r-- | CMakeInstallation.cmake | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake index a0a6f3d..0d071e7 100644 --- a/CMakeInstallation.cmake +++ b/CMakeInstallation.cmake @@ -142,7 +142,6 @@ ENDIF (HDF5_PACK_EXAMPLES) IF (NOT HDF5_EXTERNALLY_CONFIGURED) INSTALL ( FILES - ${HDF5_SOURCE_DIR}/ACKNOWLEDGMENTS ${HDF5_SOURCE_DIR}/COPYING DESTINATION ${HDF5_INSTALL_DATA_DIR} COMPONENT hdfdocuments @@ -215,12 +214,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) @@ -288,6 +298,10 @@ The HDF5 data model, file format, API, library, and tools are open and distribut # SET (CPACK_RPM_USER_BINARY_SPECFILE "${CMAKE_CURRENT_BINARY_DIR}/${HDF5_PACKAGE_NAME}.spec") ENDIF (WIN32) + # By default, do not warn when built on machines using only VS Express: + IF (NOT DEFINED CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS) + SET (CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS ON) + ENDIF(NOT DEFINED CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS) INCLUDE(InstallRequiredSystemLibraries) SET (CPACK_INSTALL_CMAKE_PROJECTS "${HDF5_BINARY_DIR};HDF5;ALL;/") |