diff options
| author | Daniel Molkentin <danimo@owncloud.com> | 2015-03-13 16:04:16 +0300 |
|---|---|---|
| committer | Daniel Molkentin <danimo@owncloud.com> | 2015-07-17 15:42:18 +0300 |
| commit | 7a8a8ceedc6a1399943dca899a3b0e6cced73194 (patch) | |
| tree | 0851a877b818a3a9eb8b74b467965634edb35a46 /cmake | |
| parent | 770ca776733d409038cbea8703f71d2a70bf507f (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')
| -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 28e71457c..1ef5634af 100644 --- a/cmake/modules/NSIS.template.in +++ b/cmake/modules/NSIS.template.in @@ -96,6 +96,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 @@ -259,7 +260,7 @@ FunctionEnd ############################################################################## !macro CheckForProcess processName gotoWhenFound gotoWhenNotFound - Processes::FindProcess ${processName} + ${nsProcess::FindProcess} ${processName} $R0 StrCmp $R0 "0" ${gotoWhenNotFound} ${gotoWhenFound} !macroend @@ -269,7 +270,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 |