diff options
| author | Clinton Stimpson <clinton@elemtech.com> | 2011-07-29 18:23:22 (GMT) |
|---|---|---|
| committer | Clinton Stimpson <clinton@elemtech.com> | 2011-07-29 18:23:22 (GMT) |
| commit | e6d2bcfde2c0cd254ce1461e368ff79eb0010473 (patch) | |
| tree | 1e0c524a102e0bc3191a270cd14ddb75cd1c531c /Modules/CPack.cmake | |
| parent | 5ef20b2dc54474ceba1c81a75e8c3fc558d505fa (diff) | |
| download | CMake-e6d2bcfde2c0cd254ce1461e368ff79eb0010473.zip CMake-e6d2bcfde2c0cd254ce1461e368ff79eb0010473.tar.gz CMake-e6d2bcfde2c0cd254ce1461e368ff79eb0010473.tar.bz2 | |
CPack/NSIS: Fix reinstall and multiple install issues when using components.
Fix NSIS template to more thoroughly use CPACK_PACKAGE_INSTALL_REGISTRY_KEY.
This allows different versions of software to have a separate sections in the
registry to keep track of things (installed components, and uninstall stuff).
Change default of CPACK_PACKAGE_INSTALL_REGISTRY_KEY to follow the value of
CPACK_PACKAGE_INSTALL_DIRECTORY so if an installation overwrites another installation,
the proper registry entries are more likely to be overwritten.
Fix CPack/NSIS generator to not insert code in the NSIS template to skip installation
of already installed components. This enables a repair like behavior and also enables
installing patch releases on top of an older installation.
Diffstat (limited to 'Modules/CPack.cmake')
| -rw-r--r-- | Modules/CPack.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake index bf52b25..d82de93 100644 --- a/Modules/CPack.cmake +++ b/Modules/CPack.cmake @@ -322,7 +322,7 @@ cpack_set_if_not_set(CPACK_PACKAGE_FILE_NAME cpack_set_if_not_set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_NAME} ${CPACK_PACKAGE_VERSION}") cpack_set_if_not_set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY - "${CPACK_PACKAGE_NAME} ${CPACK_PACKAGE_VERSION}") + "${CPACK_PACKAGE_INSTALL_DIRECTORY}") cpack_set_if_not_set(CPACK_PACKAGE_DEFAULT_LOCATION "/") cpack_set_if_not_set(CPACK_PACKAGE_RELOCATABLE "true") |