diff options
| author | Brad King <brad.king@kitware.com> | 2024-01-25 15:39:50 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-01-25 15:40:00 (GMT) |
| commit | 23747f705602cbc47672c6db6716afbe8b5b013e (patch) | |
| tree | c17021aedf9c521d0540dc55cdbf07f3ade44e8f /Source/cmcmd.cxx | |
| parent | 30c067e24ad437e8b71ad5373032265c6dbbe299 (diff) | |
| parent | adb3e13d323aeb19c3824112cfa712cc122db3b4 (diff) | |
| download | CMake-23747f705602cbc47672c6db6716afbe8b5b013e.zip CMake-23747f705602cbc47672c6db6716afbe8b5b013e.tar.gz CMake-23747f705602cbc47672c6db6716afbe8b5b013e.tar.bz2 | |
Merge topic 'cmuvprocesschain' into release-3.28
adb3e13d32 cmUVProcessChain: Tolerate fileno() of invalid FILE stream
b6e4e4babc cmUVProcessChain: Simplify SetExternalStream usage
116bb2b70f cmUVProcessChain: Simplify builder initialization
d32c30906a Tests: Add missing include in testUVProcessChainHelper on Windows
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9181
Diffstat (limited to 'Source/cmcmd.cxx')
| -rw-r--r-- | Source/cmcmd.cxx | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx index 43a945f..5bf8edc 100644 --- a/Source/cmcmd.cxx +++ b/Source/cmcmd.cxx @@ -11,8 +11,6 @@ #include <cm3p/uv.h> #include <fcntl.h> -#include "cm_fileno.hxx" - #include "cmCommandLineArgument.h" #include "cmConsoleBuf.h" #include "cmCryptoHash.h" @@ -1903,11 +1901,8 @@ int cmcmd::ExecuteLinkScript(std::vector<std::string> const& args) cmUVProcessChainBuilder builder; // Children should share stdout and stderr with this process. - builder - .SetExternalStream(cmUVProcessChainBuilder::Stream_OUTPUT, - cm_fileno(stdout)) - .SetExternalStream(cmUVProcessChainBuilder::Stream_ERROR, - cm_fileno(stderr)); + builder.SetExternalStream(cmUVProcessChainBuilder::Stream_OUTPUT, stdout) + .SetExternalStream(cmUVProcessChainBuilder::Stream_ERROR, stderr); // Setup this command line. std::vector<std::string> args2; |