From 4e03a06ff9e46706ecbb262bbe470696015ea327 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 13 Jan 2016 15:10:34 -0800
Subject: [PATCH] set package name prior to uninstaller creation
---
cmake/templates/NSIS.template.in | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in
index 3cd4531d11..a1c53c1f16 100644
--- a/cmake/templates/NSIS.template.in
+++ b/cmake/templates/NSIS.template.in
@@ -33,6 +33,9 @@
; leverage the UAC NSIS plugin to promote uninstaller to elevated privileges
!include UAC.nsh
+ ; Set name prior to inner loop so uninstaller has correct values
+ Name "@CPACK_NSIS_PACKAGE_NAME@"
+
!ifdef INNER
!echo "Inner invocation" ; just to see what's going on
@@ -69,8 +72,7 @@
; Good. Now we can carry on writing the real installer.
- ;Name and file
- Name "@CPACK_NSIS_PACKAGE_NAME@"
+ ;Output file
OutFile "@CPACK_TOPLEVEL_DIRECTORY@/@CPACK_OUTPUT_FILE_NAME@"
;Set compression