diff options
| author | Brad King <brad.king@kitware.com> | 2019-02-08 13:47:57 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-02-08 13:49:35 (GMT) |
| commit | 89ca5d7fdce7730f38a719683059bbe02e6fb19d (patch) | |
| tree | 8f9141729231e42ee47a2837d986801ee423607b /Source/cmSystemTools.cxx | |
| parent | bf1279450496db727a646afb29109cb9eba3c7b4 (diff) | |
| parent | 82edd98300b9d050dd28fdfa1e6ea7b18ecca22c (diff) | |
| download | CMake-89ca5d7fdce7730f38a719683059bbe02e6fb19d.zip CMake-89ca5d7fdce7730f38a719683059bbe02e6fb19d.tar.gz CMake-89ca5d7fdce7730f38a719683059bbe02e6fb19d.tar.bz2 | |
Merge topic 'message-stdstring'
82edd98300 cmSystemTools: MessageCallback and Message() accept std::string argument
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2929
Diffstat (limited to 'Source/cmSystemTools.cxx')
| -rw-r--r-- | Source/cmSystemTools.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index b3e6e62..89bf2f8 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -323,16 +323,16 @@ void cmSystemTools::Stdout(const std::string& s) } } -void cmSystemTools::Message(const char* m1, const char* title) +void cmSystemTools::Message(const std::string& m, const char* title) { if (s_DisableMessages) { return; } if (s_MessageCallback) { - s_MessageCallback(m1, title); + s_MessageCallback(m, title); return; } - std::cerr << m1 << std::endl << std::flush; + std::cerr << m << std::endl << std::flush; } void cmSystemTools::ReportLastSystemError(const char* msg) |