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/cmMakefile.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/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 3ae8034..ab139c0 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -3749,8 +3749,7 @@ int cmMakefile::ConfigureFile(const char* infile, const char* outfile, } if (copyonly) { - if (!cmSystemTools::CopyFileIfDifferent(sinfile.c_str(), - soutfile.c_str())) { + if (!cmSystemTools::CopyFileIfDifferent(sinfile, soutfile)) { return 0; } } else { @@ -3801,8 +3800,7 @@ int cmMakefile::ConfigureFile(const char* infile, const char* outfile, // close the files before attempting to copy fin.close(); fout.close(); - if (!cmSystemTools::CopyFileIfDifferent(tempOutputFile.c_str(), - soutfile.c_str())) { + if (!cmSystemTools::CopyFileIfDifferent(tempOutputFile, soutfile)) { res = 0; } else { cmSystemTools::SetPermissions(soutfile, perm); |