philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[svn-r24680] Remove acknowledgment file from install.

Browse Source 
Remove obsolete CPack.cmake file.
Merge h5repack and h5mkgrp test folder changes from trunk.

Tested: local linux
This commit is contained in:
Allen Byrne
2014-02-03 16:59:26 -05:00
parent 960dbc9169
commit ea30f2156b
10 changed files with 110 additions and 671 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
config/cmake/NSIS.template.in
View File

@@ -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: