diff options
| author | Brad King <brad.king@kitware.com> | 2011-01-11 20:48:34 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-01-11 20:48:34 (GMT) |
| commit | b524f864ca4928b266a3d5504cb5e62f9ca6038a (patch) | |
| tree | f07a0499a06c7957f41ba900c7820750755871a7 /Modules/CPack.cmake | |
| parent | 3272d2d96fc047cbee7610ec8747f21f57752c1e (diff) | |
| parent | 5a9e8e701e6e55ddacbc465f4bfb0da3d028ccb0 (diff) | |
| download | CMake-b524f864ca4928b266a3d5504cb5e62f9ca6038a.zip CMake-b524f864ca4928b266a3d5504cb5e62f9ca6038a.tar.gz CMake-b524f864ca4928b266a3d5504cb5e62f9ca6038a.tar.bz2 | |
Merge topic 'fix-9148-cpack-nsis-installer-root'
5a9e8e7 CPack: Add CPACK_NSIS_INSTALL_ROOT variable (#9148)
Diffstat (limited to 'Modules/CPack.cmake')
| -rw-r--r-- | Modules/CPack.cmake | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake index 5f9f05f..797ee57 100644 --- a/Modules/CPack.cmake +++ b/Modules/CPack.cmake @@ -210,6 +210,11 @@ # CPACK_PACKAGE_INSTALL_REGISTRY_KEY - Registry key used when # installing this project. # +# CPACK_NSIS_INSTALL_ROOT - The default installation directory presented +# to the end user by the NSIS installer is under this root dir. The full +# directory presented to the end user is: +# ${CPACK_NSIS_INSTALL_ROOT}/${CPACK_PACKAGE_INSTALL_DIRECTORY} +# # CPACK_NSIS_MUI_ICON - The icon file (.ico) for the generated # install program. # @@ -785,6 +790,11 @@ IF(${__cpack_system_name} MATCHES Windows) ENDIF(${__cpack_system_name} MATCHES Windows) cpack_set_if_not_set(CPACK_SYSTEM_NAME "${__cpack_system_name}") +# Root dir: default value should be the string literal "$PROGRAMFILES" +# for backwards compatibility. Projects may set this value to anything. +set(__cpack_root_default "$PROGRAMFILES") +cpack_set_if_not_set(CPACK_NSIS_INSTALL_ROOT "${__cpack_root_default}") + # <project>-<major>.<minor>.<patch>-<release>-<platform>.<pkgtype> cpack_set_if_not_set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_SYSTEM_NAME}") |