summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2012-03-22 22:21:37 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2012-03-22 22:21:37 (GMT)
commitc9f0f2ec22961b297d615c2deac0ce4b52a07b96 (patch)
tree887fc431c13e4312e3c4c857d083158b466f7974
parentdaef205d04464c96d933727d1e97378cbfe094cf (diff)
downloadhdf5-c9f0f2ec22961b297d615c2deac0ce4b52a07b96.zip
hdf5-c9f0f2ec22961b297d615c2deac0ce4b52a07b96.tar.gz
hdf5-c9f0f2ec22961b297d615c2deac0ce4b52a07b96.tar.bz2
[svn-r22126] Fixes for Component installation
-rw-r--r--CMakeLists.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fe8a5f8..5543b48 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -919,6 +919,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}")
@@ -935,8 +936,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)