mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-28 19:58:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'copyfile-stdstring'

Browse Source 
c31b6e616d cmSystemTools: copy file member functions accept std::string params

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2877
This commit is contained in:
Brad King
2019-01-30 13:08:53 +00:00
committed by Kitware Robot
parent 8ec149003e c31b6e616d
commit bcec7d0778
11 changed files with 18 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/CPack/IFW/cmCPackIFWInstaller.cxx
View File

@@ -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;
}
}