diff options
author | Brad King <brad.king@kitware.com> | 2020-10-15 12:10:40 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2020-10-15 12:10:51 (GMT) |
commit | 9493532f80f27313e82b64b053fcc7d61626c1b4 (patch) | |
tree | 24787f63bb2ae9ca5ad91870a4c33845fa41d6c9 /Source/cmcmd.h | |
parent | 64449c9f949948aa956ea03682530df9317f37ef (diff) | |
parent | f7a5f283188c1e51b0fb549f0a78afaf1d570383 (diff) | |
download | CMake-9493532f80f27313e82b64b053fcc7d61626c1b4.zip CMake-9493532f80f27313e82b64b053fcc7d61626c1b4.tar.gz CMake-9493532f80f27313e82b64b053fcc7d61626c1b4.tar.bz2 |
Merge topic 'cmake-E-cat-binary'
f7a5f28318 cmake: Fix '-E cat' command for binary files on Windows
90b39a5209 cmConsoleBuf: Factor out cout/cerr console buffer management
f1fdd15863 clang-format: Fix include block order in ctest.cxx and cpack.cxx
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5364
Diffstat (limited to 'Source/cmcmd.h')
-rw-r--r-- | Source/cmcmd.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/cmcmd.h b/Source/cmcmd.h index 605df23..a2e0b1e 100644 --- a/Source/cmcmd.h +++ b/Source/cmcmd.h @@ -4,11 +4,14 @@ #include "cmConfigure.h" // IWYU pragma: keep +#include <memory> #include <string> #include <vector> #include "cmCryptoHash.h" +class cmConsoleBuf; + class cmcmd { public: @@ -16,7 +19,8 @@ public: * Execute commands during the build process. Supports options such * as echo, remove file etc. */ - static int ExecuteCMakeCommand(std::vector<std::string> const&); + static int ExecuteCMakeCommand(std::vector<std::string> const&, + std::unique_ptr<cmConsoleBuf> consoleBuf); protected: static int HandleCoCompileCommands(std::vector<std::string> const& args); |