diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2012-05-23 18:31:42 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2012-05-23 18:31:42 (GMT) |
| commit | 588c5107ced043b2fbef5bad6334873d3107722e (patch) | |
| tree | f4c6c2729b16c89050c5f4ab339257b70ed298c4 /CMakeLists.txt | |
| parent | 58d14b196b9aef988a6593a01a445e62d92ad636 (diff) | |
| download | hdf5-588c5107ced043b2fbef5bad6334873d3107722e.zip hdf5-588c5107ced043b2fbef5bad6334873d3107722e.tar.gz hdf5-588c5107ced043b2fbef5bad6334873d3107722e.tar.bz2 | |
[svn-r22397] Merge trunk changes for HDFFV-7999 and h5dump test script to branch
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 35f723e..082cc48 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -929,6 +929,7 @@ IF (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES) SET (CPACK_PACKAGE_VENDOR "HDF Group") SET (CPACK_PACKAGE_NAME "${HDF5_PACKAGE_NAME}") SET (CPACK_PACKAGE_INSTALL_DIRECTORY "${HDF5_PACKAGE_NAME}") + SET (CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${HDF5_PACKAGE_NAME}-${HDF5_PACKAGE_VERSION}-${LIB_TYPE}") SET (CPACK_PACKAGE_VERSION "${HDF5_PACKAGE_VERSION}") SET (CPACK_PACKAGE_VERSION_MAJOR "${HDF5_PACKAGE_VERSION_MAJOR}") SET (CPACK_PACKAGE_VERSION_MINOR "${HDF5_PACKAGE_VERSION_MINOR}") @@ -945,8 +946,9 @@ IF (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES) SET (CPACK_NSIS_PACKAGE_NAME "HDF5 ${HDF5_PACKAGE_VERSION}") ELSE (WIN32) SET (CPACK_RPM_COMPONENT_INSTALL ON) + SET (CPACK_ARCHIVE_COMPONENT_INSTALL ON) + SET (CPACK_COMPONENTS_ALL_IN_ONE_PACKAGE ON) ENDIF (WIN32) - SET (CPACK_MONOLITHIC_INSTALL ON) INCLUDE(InstallRequiredSystemLibraries) |