diff options
| author | Brad King <brad.king@kitware.com> | 2019-02-13 15:16:36 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-02-13 15:17:08 (GMT) |
| commit | 8914d4317a21a5673afbc72312559cc53e73eeec (patch) | |
| tree | cb5609ef9ed6da7c4f819f089c266d994b6af4a3 /Source/CPack/cmCPackGenerator.cxx | |
| parent | 264128469df1460c60099a3321b80cedcf8d2d26 (diff) | |
| parent | 080a79ca4a0448043e0713b9b580c5f84b7330b3 (diff) | |
| download | CMake-8914d4317a21a5673afbc72312559cc53e73eeec.zip CMake-8914d4317a21a5673afbc72312559cc53e73eeec.tar.gz CMake-8914d4317a21a5673afbc72312559cc53e73eeec.tar.bz2 | |
Merge topic 'systools-stdstring2'
080a79ca4a cmSystemTools: More methods accept `std::string` params
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2952
Diffstat (limited to 'Source/CPack/cmCPackGenerator.cxx')
| -rw-r--r-- | Source/CPack/cmCPackGenerator.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx index 2917763..fc34ef8 100644 --- a/Source/CPack/cmCPackGenerator.cxx +++ b/Source/CPack/cmCPackGenerator.cxx @@ -388,8 +388,7 @@ int cmCPackGenerator::InstallProjectViaInstalledDirectories( } /* If it is not a symlink then do a plain copy */ else if (!(cmSystemTools::CopyFileIfDifferent(inFile, filePath) && - cmSystemTools::CopyFileTime(inFile.c_str(), - filePath.c_str()))) { + cmSystemTools::CopyFileTime(inFile, filePath))) { cmCPackLogger(cmCPackLog::LOG_ERROR, "Problem copying file: " << inFile << " -> " << filePath << std::endl); |