diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2014-01-16 18:58:49 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2014-01-16 18:58:49 (GMT) |
| commit | 1596d156236ecf4adda6b6294eddce277af4b970 (patch) | |
| tree | c6d7b18960daa6430b28d89fd08ce802f852dfaf /CMakeInstallation.cmake | |
| parent | d4d0407a870b0900abeb4a40bac258362b95a5a5 (diff) | |
| download | hdf5-1596d156236ecf4adda6b6294eddce277af4b970.zip hdf5-1596d156236ecf4adda6b6294eddce277af4b970.tar.gz hdf5-1596d156236ecf4adda6b6294eddce277af4b970.tar.bz2 | |
[svn-r24631] Update change to relative install location for linux
Diffstat (limited to 'CMakeInstallation.cmake')
| -rw-r--r-- | CMakeInstallation.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake index 5929380..cea7338 100644 --- a/CMakeInstallation.cmake +++ b/CMakeInstallation.cmake @@ -215,7 +215,7 @@ IF (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES) SET (CPACK_GENERATOR "TGZ") IF (WIN32) LIST (APPEND CPACK_GENERATOR "NSIS") - SET (CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_VENDOR}\\\\${HDF5_PACKAGE_NAME}\\\\${CPACK_PACKAGE_VERSION}") + 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}") @@ -250,7 +250,7 @@ IF (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES) ENDIF(HDF5_PACK_MACOSX_BUNDLE) ELSE (WIN32) LIST (APPEND CPACK_GENERATOR "STGZ") - SET (CPACK_PACKAGING_INSTALL_PREFIX "/usr") + SET (CPACK_PACKAGING_INSTALL_PREFIX "/${CPACK_PACKAGE_VENDOR}/${CPACK_PACKAGE_NAME}/${CPACK_PACKAGE_VERSION}") SET (CPACK_COMPONENTS_ALL_IN_ONE_PACKAGE ON) SET (CPACK_DEBIAN_PACKAGE_SECTION "Libraries") |