diff options
| author | Brad King <brad.king@kitware.com> | 2011-01-11 20:48:34 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-01-11 20:48:34 (GMT) |
| commit | b524f864ca4928b266a3d5504cb5e62f9ca6038a (patch) | |
| tree | f07a0499a06c7957f41ba900c7820750755871a7 /Modules/NSIS.template.in | |
| parent | 3272d2d96fc047cbee7610ec8747f21f57752c1e (diff) | |
| parent | 5a9e8e701e6e55ddacbc465f4bfb0da3d028ccb0 (diff) | |
| download | CMake-b524f864ca4928b266a3d5504cb5e62f9ca6038a.zip CMake-b524f864ca4928b266a3d5504cb5e62f9ca6038a.tar.gz CMake-b524f864ca4928b266a3d5504cb5e62f9ca6038a.tar.bz2 | |
Merge topic 'fix-9148-cpack-nsis-installer-root'
5a9e8e7 CPack: Add CPACK_NSIS_INSTALL_ROOT variable (#9148)
Diffstat (limited to 'Modules/NSIS.template.in')
| -rw-r--r-- | Modules/NSIS.template.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/NSIS.template.in b/Modules/NSIS.template.in index ffe0515..df9d2d3 100644 --- a/Modules/NSIS.template.in +++ b/Modules/NSIS.template.in @@ -25,7 +25,7 @@ !include "MUI.nsh" ;Default installation folder - InstallDir "$PROGRAMFILES\@CPACK_PACKAGE_INSTALL_DIRECTORY@" + InstallDir "@CPACK_NSIS_INSTALL_ROOT@\@CPACK_PACKAGE_INSTALL_DIRECTORY@" ;-------------------------------- ;General @@ -907,7 +907,7 @@ Function .onInit ; install directory that is expected to be the ; default StrCpy $IS_DEFAULT_INSTALLDIR 0 - StrCmp "$INSTDIR" "$PROGRAMFILES\@CPACK_PACKAGE_INSTALL_DIRECTORY@" 0 +2 + StrCmp "$INSTDIR" "@CPACK_NSIS_INSTALL_ROOT@\@CPACK_PACKAGE_INSTALL_DIRECTORY@" 0 +2 StrCpy $IS_DEFAULT_INSTALLDIR 1 StrCpy $SV_ALLUSERS "JustMe" @@ -940,7 +940,7 @@ Function .onInit done: StrCmp $SV_ALLUSERS "AllUsers" 0 +3 StrCmp "$IS_DEFAULT_INSTALLDIR" "1" 0 +2 - StrCpy $INSTDIR "$PROGRAMFILES\@CPACK_PACKAGE_INSTALL_DIRECTORY@" + StrCpy $INSTDIR "@CPACK_NSIS_INSTALL_ROOT@\@CPACK_PACKAGE_INSTALL_DIRECTORY@" StrCmp "@CPACK_NSIS_MODIFY_PATH@" "ON" 0 noOptionsPage !insertmacro MUI_INSTALLOPTIONS_EXTRACT "NSIS.InstallOptions.ini" |