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/CTest | |
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/CTest')
-rw-r--r-- | Source/CTest/cmCTestBuildAndTestHandler.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/CTest/cmCTestBuildAndTestHandler.cxx b/Source/CTest/cmCTestBuildAndTestHandler.cxx index 2fd4c7a..3856569 100644 --- a/Source/CTest/cmCTestBuildAndTestHandler.cxx +++ b/Source/CTest/cmCTestBuildAndTestHandler.cxx @@ -118,7 +118,7 @@ public: : CM(cm) { cmSystemTools::SetMessageCallback( - [&s](const char* msg, const char* /*unused*/) { + [&s](const std::string& msg, const char* /*unused*/) { s += msg; s += "\n"; }); |