diff options
| author | Daniel Molkentin <danimo@owncloud.com> | 2015-03-13 16:04:16 +0300 |
|---|---|---|
| committer | Daniel Molkentin <danimo@owncloud.com> | 2015-06-03 09:21:10 +0300 |
| commit | e1a36b53dc4646118cc2bc30b368c7f8a7ca264c (patch) | |
| tree | 24718f1a81a27fc33621d319d5e5a6c80980bb4b /cmake/modules/NSIS.template.in | |
| parent | 5f91abd7c6612e63879bf8fa4ccec4bf094916a6 (diff) | |
NSIS: depend on nsProcess instead of Processes NSIS plugin
The Processes plugin is no longer maintained, and OBS
compiles an up-to-date version of nsProcess for us.
Diffstat (limited to 'cmake/modules/NSIS.template.in')
| -rw-r--r-- | cmake/modules/NSIS.template.in | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cmake/modules/NSIS.template.in b/cmake/modules/NSIS.template.in index 0f333869f..1a776a702 100644 --- a/cmake/modules/NSIS.template.in +++ b/cmake/modules/NSIS.template.in @@ -97,6 +97,7 @@ ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll" !include WordFunc.nsh ;Used by VersionCompare macro function. !include FileFunc.nsh ;Used to read out parameters !include UAC.nsh ;Used by the UAC elevation to install as user or admin. +!include nsProcess.nsh ;Used to kill the running process !include Library.nsh ;Used by the COM registration for shell extensions !include x64.nsh ;Used to determine the right arch for the shell extensions @@ -261,7 +262,7 @@ FunctionEnd ############################################################################## !macro CheckForProcess processName gotoWhenFound gotoWhenNotFound - Processes::FindProcess ${processName} + ${nsProcess::FindProcess} ${processName} $R0 StrCmp $R0 "0" ${gotoWhenNotFound} ${gotoWhenFound} !macroend @@ -271,7 +272,7 @@ FunctionEnd /SD IDYES IDYES process_${processName}_kill IDNO process_${processName}_ended process_${processName}_kill: DetailPrint $ConfirmEndProcess_KILLING_PROCESSES_TEXT - Processes::KillProcess ${processName} + ${nsProcess::KillProcess} ${processName} $R0 Sleep 1500 StrCmp $R0 "1" process_${processName}_ended DetailPrint $ConfirmEndProcess_KILL_NOT_FOUND_TEXT |