summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-10-28 14:05:42 (GMT)
committerKitware Robot <kwrobot@kitware.com>2019-10-28 14:06:40 (GMT)
commitf289ab61e36b94b9b718aa22b55b79b882df7b93 (patch)
tree7bb2cab0857b12f90c86714de904386cb8c001ba /Help
parentcb13aa580d918816538e76efb666f1209f0dd717 (diff)
parentc97abc96882caab6cba49f6ab1b00ceb88b5a757 (diff)
downloadCMake-f289ab61e36b94b9b718aa22b55b79b882df7b93.zip
CMake-f289ab61e36b94b9b718aa22b55b79b882df7b93.tar.gz
CMake-f289ab61e36b94b9b718aa22b55b79b882df7b93.tar.bz2
Merge topic 'cpack-nsis-uninstaller-name'
c97abc9688 CPack/NSIS: Add option for custom Uninstall filename Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3945
Diffstat (limited to 'Help')
-rw-r--r--Help/cpack_gen/nsis.rst5
-rw-r--r--Help/release/dev/cpack-nsis-uninstaller-name.rst6
2 files changed, 11 insertions, 0 deletions
diff --git a/Help/cpack_gen/nsis.rst b/Help/cpack_gen/nsis.rst
index cd2aea6..38676c4 100644
--- a/Help/cpack_gen/nsis.rst
+++ b/Help/cpack_gen/nsis.rst
@@ -128,3 +128,8 @@ on Windows Nullsoft Scriptable Install System.
set(CPACK_NSIS_MENU_LINKS
"doc/cmake-@CMake_VERSION_MAJOR@.@CMake_VERSION_MINOR@/cmake.html"
"CMake Help" "https://cmake.org" "CMake Web Site")
+
+.. variable:: CPACK_NSIS_UNINSTALL_NAME
+
+ Specify the name of the program to uninstall the version.
+ Default is ``Uninstall``.
diff --git a/Help/release/dev/cpack-nsis-uninstaller-name.rst b/Help/release/dev/cpack-nsis-uninstaller-name.rst
new file mode 100644
index 0000000..b7ceb4c
--- /dev/null
+++ b/Help/release/dev/cpack-nsis-uninstaller-name.rst
@@ -0,0 +1,6 @@
+cpack-nsis-uninstaller-name
+---------------------------
+
+* The :cpack_gen:`CPack NSIS Generator` now supports
+ :variable:`CPACK_NSIS_UNINSTALL_NAME`.
+ This can be used to specify the name of the Uninstall program.