diff options
| author | Brad King <brad.king@kitware.com> | 2015-05-07 18:34:50 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-05-07 18:34:50 (GMT) |
| commit | 31c218e6e12affd482b9ce2880bd9385c77d9025 (patch) | |
| tree | 1285f1672ae6f6bc845d0a32e5155881546d84d4 /Source/kwsys/Process.h.in | |
| parent | ee1ddec4c19488216289dfd26998091b695bf3ee (diff) | |
| parent | ac94a796f1f0c5acc06d67d5ad283b29476c1d2e (diff) | |
| download | CMake-31c218e6e12affd482b9ce2880bd9385c77d9025.zip CMake-31c218e6e12affd482b9ce2880bd9385c77d9025.tar.gz CMake-31c218e6e12affd482b9ce2880bd9385c77d9025.tar.bz2 | |
Merge branch 'upstream-kwsys' into update-kwsys
Diffstat (limited to 'Source/kwsys/Process.h.in')
| -rw-r--r-- | Source/kwsys/Process.h.in | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Source/kwsys/Process.h.in b/Source/kwsys/Process.h.in index c5995ea..e35939f 100644 --- a/Source/kwsys/Process.h.in +++ b/Source/kwsys/Process.h.in @@ -36,6 +36,7 @@ # define kwsysProcess_SetPipeShared kwsys_ns(Process_SetPipeShared) # define kwsysProcess_Option_Detach kwsys_ns(Process_Option_Detach) # define kwsysProcess_Option_HideWindow kwsys_ns(Process_Option_HideWindow) +# define kwsysProcess_Option_MergeOutput kwsys_ns(Process_Option_MergeOutput) # define kwsysProcess_Option_Verbatim kwsys_ns(Process_Option_Verbatim) # define kwsysProcess_GetOption kwsys_ns(Process_GetOption) # define kwsysProcess_SetOption kwsys_ns(Process_SetOption) @@ -186,6 +187,12 @@ kwsysEXPORT void kwsysProcess_SetPipeNative(kwsysProcess* cp, int pipe, * 0 = No (default) * 1 = Yes * + * kwsysProcess_Option_MergeOutput = Whether to merge stdout/stderr. + * No content will be returned as stderr. + * Any actual stderr will be on stdout. + * 0 = No (default) + * 1 = Yes + * * kwsysProcess_Option_Verbatim = Whether SetCommand and AddCommand * should treat the first argument * as a verbatim command line @@ -200,6 +207,7 @@ enum kwsysProcess_Option_e { kwsysProcess_Option_HideWindow, kwsysProcess_Option_Detach, + kwsysProcess_Option_MergeOutput, kwsysProcess_Option_Verbatim }; @@ -384,6 +392,7 @@ kwsysEXPORT void kwsysProcess_Kill(kwsysProcess* cp); # undef kwsysProcess_SetPipeShared # undef kwsysProcess_Option_Detach # undef kwsysProcess_Option_HideWindow +# undef kwsysProcess_Option_MergeOutput # undef kwsysProcess_Option_Verbatim # undef kwsysProcess_GetOption # undef kwsysProcess_SetOption |