diff options
| author | Brad King <brad.king@kitware.com> | 2019-02-12 13:28:43 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-02-12 13:30:13 (GMT) |
| commit | 20afd497c92f66883de5dae92e2105c2f0cb4f70 (patch) | |
| tree | e466ac318883d07a73f3e0cea1f26f1b4443569f /Source/CPack/cmCPackGenerator.h | |
| parent | a7a85719332b5be90bb9ce1f3707a767197566c0 (diff) | |
| parent | 950c099d83757acd57cec78a3579ea1f6aaddf96 (diff) | |
| download | CMake-20afd497c92f66883de5dae92e2105c2f0cb4f70.zip CMake-20afd497c92f66883de5dae92e2105c2f0cb4f70.tar.gz CMake-20afd497c92f66883de5dae92e2105c2f0cb4f70.tar.bz2 | |
Merge topic 'progress-stdstring'
950c099d83 cmake: Progress functions use `std::string` param
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2948
Diffstat (limited to 'Source/CPack/cmCPackGenerator.h')
| -rw-r--r-- | Source/CPack/cmCPackGenerator.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/CPack/cmCPackGenerator.h b/Source/CPack/cmCPackGenerator.h index 4755f94..9e4bf43 100644 --- a/Source/CPack/cmCPackGenerator.h +++ b/Source/CPack/cmCPackGenerator.h @@ -96,7 +96,7 @@ public: void SetLogger(cmCPackLog* log) { this->Logger = log; } //! Display verbose information via logger - void DisplayVerboseOutput(const char* msg, float progress); + void DisplayVerboseOutput(const std::string& msg, float progress); bool ReadListFile(const char* moduleName); |