From 8e3f18b6280cf9c1d82aafd3f0f1a19ad0f3f1cf Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 13 Jan 2016 16:49:39 -0800
Subject: [PATCH] require append of @CPACK_PACKAGE_INSTALL_REGISTRY_KEY@ to
 root

---
 cmake/macros/SetPackagingParameters.cmake |  2 +-
 cmake/templates/NSIS.template.in          | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cmake/macros/SetPackagingParameters.cmake b/cmake/macros/SetPackagingParameters.cmake
index 8bf4e2971a..321f855ec7 100644
--- a/cmake/macros/SetPackagingParameters.cmake
+++ b/cmake/macros/SetPackagingParameters.cmake
@@ -71,7 +71,7 @@ macro(SET_PACKAGING_PARAMETERS)
     endif ()
 
     set(GENERATED_UNINSTALLER_EXEC_NAME "Uninstall.exe")
-    set(REGISTRY_HKLM_INSTALL_ROOT "Software\\Microsoft\\Windows\\CurrentVersion\\Install\\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@")
+    set(REGISTRY_HKLM_INSTALL_ROOT "Software\\Microsoft\\Windows\\CurrentVersion\\Install")
     set(POST_INSTALL_OPTIONS_REG_GROUP "PostInstallOptions")
     set(CLIENT_DESKTOP_SHORTCUT_REG_KEY "ClientDesktopShortcut")
     set(CONSOLE_DESKTOP_SHORTCUT_REG_KEY "ConsoleDesktopShortcut")
diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in
index 86f701d867..4c2acaf14c 100644
--- a/cmake/templates/NSIS.template.in
+++ b/cmake/templates/NSIS.template.in
@@ -893,7 +893,7 @@ Function HandlePostInstallOptions
 
     ${If} $DESKTOP_CLIENT_STATE == ${BST_CHECKED}
       CreateShortCut "$DESKTOP\@INTERFACE_SHORTCUT_NAME@.lnk" "$INSTDIR\@INTERFACE_WIN_EXEC_NAME@"
-      WriteRegDWORD HKLM "@REGISTRY_HKLM_INSTALL_ROOT@\@POST_INSTALL_OPTIONS_REG_GROUP@" "@CLIENT_DESKTOP_SHORTCUT_REG_KEY@" 1
+      WriteRegDWORD HKLM "@REGISTRY_HKLM_INSTALL_ROOT@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@\@POST_INSTALL_OPTIONS_REG_GROUP@" "@CLIENT_DESKTOP_SHORTCUT_REG_KEY@" 1
     ${EndIf}
 
   ${EndIf}
@@ -904,7 +904,7 @@ Function HandlePostInstallOptions
 
     ${If} $DESKTOP_SERVER_STATE == ${BST_CHECKED}
       CreateShortCut "$DESKTOP\@CONSOLE_SHORTCUT_NAME@.lnk" "$INSTDIR\@CONSOLE_WIN_EXEC_NAME@"
-      WriteRegDWORD HKLM "@REGISTRY_HKLM_INSTALL_ROOT@" "@CONSOLE_DESKTOP_SHORTCUT_REG_KEY@" 1
+      WriteRegDWORD HKLM "@REGISTRY_HKLM_INSTALL_ROOT@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@\@POST_INSTALL_OPTIONS_REG_GROUP@" "@CONSOLE_DESKTOP_SHORTCUT_REG_KEY@" 1
     ${EndIf}
 
     ; check if the user asked to have Server Console launched every startup
@@ -913,7 +913,7 @@ Function HandlePostInstallOptions
     ${If} $SERVER_STARTUP_STATE == ${BST_CHECKED}
       CreateShortCut "$SMSTARTUP\@CONSOLE_SHORTCUT_NAME@.lnk" "$INSTDIR\@CONSOLE_WIN_EXEC_NAME@"
 
-      WriteRegDWORD HKLM "@REGISTRY_HKLM_INSTALL_ROOT@\@POST_INSTALL_OPTIONS_REG_GROUP@" "@CONSOLE_STARTUP_REG_KEY@" 1
+      WriteRegDWORD HKLM "@REGISTRY_HKLM_INSTALL_ROOT@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@\@POST_INSTALL_OPTIONS_REG_GROUP@" "@CONSOLE_STARTUP_REG_KEY@" 1
     ${EndIf}
   ${EndIf}
 
@@ -921,7 +921,7 @@ Function HandlePostInstallOptions
   ${NSD_GetState} $LAUNCH_NOW_CHECKBOX $LAUNCH_NOW_STATE
 
   ${If} $LAUNCH_NOW_STATE == ${BST_CHECKED}
-    WriteRegDWORD HKLM "@REGISTRY_HKLM_INSTALL_ROOT@\@POST_INSTALL_OPTIONS_REG_GROUP@" "@LAUNCH_NOW_REG_KEY@" 1
+    WriteRegDWORD HKLM "@REGISTRY_HKLM_INSTALL_ROOT@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@\@POST_INSTALL_OPTIONS_REG_GROUP@" "@LAUNCH_NOW_REG_KEY@" 1
 
     ; both launches use the explorer trick in case the user has elevated permissions for the installer
     ; it won't be possible to use this approach if either application should be launched with a command line param
@@ -1095,7 +1095,7 @@ Section "Uninstall"
   ${EndIf}
 
   ;Delete post-install option information from registry
-  DeleteRegKey HKLM '@REGISTRY_HKLM_INSTALL_ROOT@'
+  DeleteRegKey HKLM '@REGISTRY_HKLM_INSTALL_ROOT@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@'
 
   ;Delete empty start menu parent diretories
   StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"