diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2014-01-28 21:25:21 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2014-01-28 21:25:21 (GMT) |
| commit | 256b36e14105ab859e41582a0ab6b8d0a7ec6e83 (patch) | |
| tree | c51a31cf45740f4dd301ee886f7c6c77c9ef64af /config/cmake/NSIS.template.in | |
| parent | 50bd3521af6fa564d2ad2abfd3eeec49eabdebd5 (diff) | |
| download | hdf5-256b36e14105ab859e41582a0ab6b8d0a7ec6e83.zip hdf5-256b36e14105ab859e41582a0ab6b8d0a7ec6e83.tar.gz hdf5-256b36e14105ab859e41582a0ab6b8d0a7ec6e83.tar.bz2 | |
[svn-r24655] Correct packaging variables and use standard cpack module.
Diffstat (limited to 'config/cmake/NSIS.template.in')
| -rw-r--r-- | config/cmake/NSIS.template.in | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/config/cmake/NSIS.template.in b/config/cmake/NSIS.template.in index 59a444b..ecced05 100644 --- a/config/cmake/NSIS.template.in +++ b/config/cmake/NSIS.template.in @@ -37,9 +37,6 @@ ;Set compression SetCompressor @CPACK_NSIS_COMPRESSOR@ - ;Require administrator access - RequestExecutionLevel admin - @CPACK_NSIS_DEFINES@ !include Sections.nsh @@ -916,7 +913,9 @@ Function .onInit ;Run the uninstaller uninst: ClearErrors - ExecWait '$0 _?=$INSTDIR' ;Do not copy the uninstaller to a temp file + StrLen $2 "\Uninstall.exe" + StrCpy $3 $0 -$2 # remove "\Uninstall.exe" from UninstallString to get path + ExecWait '$0 _?=$3' ;Do not copy the uninstaller to a temp file IfErrors uninst_failed inst uninst_failed: |