diff options
| author | Brad King <brad.king@kitware.com> | 2024-05-28 12:56:21 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-05-28 12:56:42 (GMT) |
| commit | 374716a47a3aceaeef4f4ead819f21630f76facb (patch) | |
| tree | 396bc0a45a546493911c05cc59941ef062e8643e /Utilities | |
| parent | 46d00d425c1a87d0425f1df93cfc342541e85f43 (diff) | |
| parent | fa8c04b421d1d0af93d58c8e04ee0dce13ecb473 (diff) | |
| download | CMake-374716a47a3aceaeef4f4ead819f21630f76facb.zip CMake-374716a47a3aceaeef4f4ead819f21630f76facb.tar.gz CMake-374716a47a3aceaeef4f4ead819f21630f76facb.tar.bz2 | |
Merge topic 'execute_process-child-startup-info'
fa8c04b421 Tests/RunCMake/execute_process: Check STARTUPINFOW reserved members
d98df689ab Merge branch 'libuv-win-process-no-extra-stdio'
a590382850 libuv: win/spawn: disable extra-file-descriptor support not needed by CMake
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9541
Diffstat (limited to 'Utilities')
| -rw-r--r-- | Utilities/cmlibuv/src/win/process.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Utilities/cmlibuv/src/win/process.c b/Utilities/cmlibuv/src/win/process.c index 11cf5b2..5cf9fb8 100644 --- a/Utilities/cmlibuv/src/win/process.c +++ b/Utilities/cmlibuv/src/win/process.c @@ -1083,8 +1083,15 @@ int uv_spawn(uv_loop_t* loop, startup.lpTitle = NULL; startup.dwFlags = STARTF_USESTDHANDLES | STARTF_USESHOWWINDOW; +#if 1 + /* cmake does not need libuv's support for passing file descriptors >= 3 + to the MSVC C run-time in the child. Avoid using reserved members. */ + startup.cbReserved2 = 0; + startup.lpReserved2 = NULL; +#else startup.cbReserved2 = uv__stdio_size(process->child_stdio_buffer); startup.lpReserved2 = (BYTE*) process->child_stdio_buffer; +#endif startup.hStdInput = uv__stdio_handle(process->child_stdio_buffer, 0); startup.hStdOutput = uv__stdio_handle(process->child_stdio_buffer, 1); |