diff options
| author | Brad King <brad.king@kitware.com> | 2024-01-25 15:52:01 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2024-01-25 15:53:04 (GMT) |
| commit | 151601c2e3419bd65bb276e77588c551487b4744 (patch) | |
| tree | 6fef8b57dd7aa10c9f15447b18dc74951de68dad /Source/cmSystemTools.h | |
| parent | 23747f705602cbc47672c6db6716afbe8b5b013e (diff) | |
| parent | bcbb212df704d36736731aa567b291fd97401804 (diff) | |
| download | CMake-151601c2e3419bd65bb276e77588c551487b4744.zip CMake-151601c2e3419bd65bb276e77588c551487b4744.tar.gz CMake-151601c2e3419bd65bb276e77588c551487b4744.tar.bz2 | |
Merge topic 'revert-replace-cmsysprocess-with-cmuvprocesschain' into release-3.28
bcbb212df7 Revert use of libuv for process execution for 3.28
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9176
Diffstat (limited to 'Source/cmSystemTools.h')
| -rw-r--r-- | Source/cmSystemTools.h | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h index 7e33e58..9563fd6 100644 --- a/Source/cmSystemTools.h +++ b/Source/cmSystemTools.h @@ -18,8 +18,7 @@ #include <cm/optional> #include <cm/string_view> -#include <cm3p/uv.h> - +#include "cmsys/Process.h" #include "cmsys/Status.hxx" // IWYU pragma: export #include "cmsys/SystemTools.hxx" // IWYU pragma: export @@ -340,20 +339,10 @@ public: */ static void ReportLastSystemError(const char* m); - enum class WaitForLineResult - { - None, - STDOUT, - STDERR, - Timeout, - }; - - /** a general output handler for libuv */ - static WaitForLineResult WaitForLine(uv_loop_t* loop, uv_stream_t* outPipe, - uv_stream_t* errPipe, std::string& line, - cmDuration timeout, - std::vector<char>& out, - std::vector<char>& err); + /** a general output handler for cmsysProcess */ + static int WaitForLine(cmsysProcess* process, std::string& line, + cmDuration timeout, std::vector<char>& out, + std::vector<char>& err); static void SetForceUnixPaths(bool v) { s_ForceUnixPaths = v; } static bool GetForceUnixPaths() { return s_ForceUnixPaths; } |