diff options
| author | Brad King <brad.king@kitware.com> | 2019-01-30 13:08:53 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-01-30 13:08:59 (GMT) |
| commit | bcec7d0778eb87ea58d720d9e20710dc2cdfdab6 (patch) | |
| tree | 7bac9b7800d73cee8b7e05143788f9edaff64fb9 /Source/CPack/IFW/cmCPackIFWInstaller.cxx | |
| parent | 8ec149003e756d4a40f86b9025acb15f7ff82136 (diff) | |
| parent | c31b6e616d5c2d697696540ca2e8faf14160d2b0 (diff) | |
| download | CMake-bcec7d0778eb87ea58d720d9e20710dc2cdfdab6.zip CMake-bcec7d0778eb87ea58d720d9e20710dc2cdfdab6.tar.gz CMake-bcec7d0778eb87ea58d720d9e20710dc2cdfdab6.tar.bz2 | |
Merge topic 'copyfile-stdstring'
c31b6e616d cmSystemTools: copy file member functions accept std::string params
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2877
Diffstat (limited to 'Source/CPack/IFW/cmCPackIFWInstaller.cxx')
| -rw-r--r-- | Source/CPack/IFW/cmCPackIFWInstaller.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/CPack/IFW/cmCPackIFWInstaller.cxx b/Source/CPack/IFW/cmCPackIFWInstaller.cxx index 24d19d9..01e3ea4 100644 --- a/Source/CPack/IFW/cmCPackIFWInstaller.cxx +++ b/Source/CPack/IFW/cmCPackIFWInstaller.cxx @@ -286,8 +286,7 @@ protected: content = cmSystemTools::TrimWhitespace(content); std::string source = this->basePath + "/" + content; std::string destination = this->path + "/" + content; - if (!cmSystemTools::CopyFileIfDifferent(source.data(), - destination.data())) { + if (!cmSystemTools::CopyFileIfDifferent(source, destination)) { this->hasErrors = true; } } |