summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Jeanmougin <marc@jeanmougin.fr>2022-03-21 18:22:34 (GMT)
committerBrad King <brad.king@kitware.com>2022-03-21 18:53:44 (GMT)
commit5d2ceaada8b84990d828e3c98ea4f6418cac9893 (patch)
tree5986cc96c0b3fe5e0355c91bb93051e462a02a38
parentb795c96727c28982f88fcaf7127bd72067edcf4a (diff)
downloadCMake-5d2ceaada8b84990d828e3c98ea4f6418cac9893.zip
CMake-5d2ceaada8b84990d828e3c98ea4f6418cac9893.tar.gz
CMake-5d2ceaada8b84990d828e3c98ea4f6418cac9893.tar.bz2
CPack/NSIS: Add support for unquoted (legacy) uninstaller strings
-rw-r--r--Modules/Internal/CPack/NSIS.template.in4
1 files changed, 4 insertions, 0 deletions
diff --git a/Modules/Internal/CPack/NSIS.template.in b/Modules/Internal/CPack/NSIS.template.in
index 18f1ee8..f16eaf6 100644
--- a/Modules/Internal/CPack/NSIS.template.in
+++ b/Modules/Internal/CPack/NSIS.template.in
@@ -932,7 +932,11 @@ Function .onInit
;Run the uninstaller
uninst:
ClearErrors
+ StrCpy $2 $0 1
+ StrCmp '"' $2 0 +3 ; checks if string is quoted (CPack before v3.20.6 did not quote it)
ExecWait '$0 /S'
+ Goto +2
+ ExecWait '"$0" /S'
IfErrors uninst_failed inst
uninst_failed: