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:02 (GMT) |
| commit | b11c8c45f977a4d69bc5a056341b57e17a602694 (patch) | |
| tree | 42f545e8385bb1da68b7799a1fc35e0ebd48377c /Source/cmake.cxx | |
| parent | 4c4cd1246e5b66f731c6e145332ed75bf24fd045 (diff) | |
| parent | adb3e13d323aeb19c3824112cfa712cc122db3b4 (diff) | |
| download | CMake-b11c8c45f977a4d69bc5a056341b57e17a602694.zip CMake-b11c8c45f977a4d69bc5a056341b57e17a602694.tar.gz CMake-b11c8c45f977a4d69bc5a056341b57e17a602694.tar.bz2 | |
Merge topic 'cmuvprocesschain'
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/cmake.cxx')
| -rw-r--r-- | Source/cmake.cxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 7ab7600..88fac8d 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -27,7 +27,6 @@ #include "cmsys/Glob.hxx" #include "cmsys/RegularExpression.hxx" -#include "cm_fileno.hxx" #include "cm_sys_stat.h" #include "cmBuildOptions.h" @@ -3934,10 +3933,8 @@ std::function<int()> cmake::BuildWorkflowStep( { cmUVProcessChainBuilder builder; builder.AddCommand(args) - .SetExternalStream(cmUVProcessChainBuilder::Stream_OUTPUT, - cm_fileno(stdout)) - .SetExternalStream(cmUVProcessChainBuilder::Stream_ERROR, - cm_fileno(stderr)); + .SetExternalStream(cmUVProcessChainBuilder::Stream_OUTPUT, stdout) + .SetExternalStream(cmUVProcessChainBuilder::Stream_ERROR, stderr); return [builder]() -> int { auto chain = builder.Start(); chain.Wait(); |