From 70077591dfeffc61198785fc08a60a902ecac308 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 11 Jan 2016 10:17:54 -0800 Subject: [PATCH] correct intepolation for defines in NSIS --- cmake/templates/NSIS.template.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in index c2c5ab80e7..483b863cfb 100644 --- a/cmake/templates/NSIS.template.in +++ b/cmake/templates/NSIS.template.in @@ -3,8 +3,8 @@ ;-------------------------------- ; Variables that drive High Fidelity custom behaviour - StrCpy $INTERFACE_SHORTCUT_NAME "High Fidelity" - StrCpy $INTERFACE_EXEC_NAME "interface.exe" + !define INTERFACE_SHORTCUT_NAME "High Fidelity" + !define INTERFACE_EXEC_NAME "interface.exe" ;-------------------------------- ; You must define these values @@ -704,7 +704,7 @@ Section "-Core installation" ; Conditional handling for interface shortcut ${If} ${SectionIsSelected} ${client} - CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\$INTERFACE_SHORTCUT_NAME.lnk" "$INSTDIR\$INTERFACE_EXEC_NAME" + CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\${INTERFACE_SHORTCUT_NAME}.lnk" "$INSTDIR\${INTERFACE_EXEC_NAME}" ${EndIf} CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" "$INSTDIR\Uninstall.exe" @@ -861,7 +861,7 @@ Section "Uninstall" !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk" - Delete "$SMPROGRAMS\$MUI_TEMP\$INTERFACE_SHORTCUT_NAME.lnk" + Delete "$SMPROGRAMS\$MUI_TEMP\${INTERFACE_SHORTCUT_NAME}.lnk" @CPACK_NSIS_DELETE_ICONS@ @CPACK_NSIS_DELETE_ICONS_EXTRA@