summaryrefslogtreecommitdiffstats
path: root/Source/cmcmd.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-05-30 13:53:04 (GMT)
committerKitware Robot <kwrobot@kitware.com>2019-05-30 13:57:11 (GMT)
commit6e8acc51a57e60aff307e4730c8a2314e5cf737a (patch)
tree683727e09698ab349c1a6a92238e0dd2c3d647f8 /Source/cmcmd.cxx
parent9dad42d21a67592040d1100882147eed77753392 (diff)
parent57cedb18c097a7231223b8a4279534216cad1b93 (diff)
downloadCMake-6e8acc51a57e60aff307e4730c8a2314e5cf737a.zip
CMake-6e8acc51a57e60aff307e4730c8a2314e5cf737a.tar.gz
CMake-6e8acc51a57e60aff307e4730c8a2314e5cf737a.tar.bz2
Merge topic 'string-tar'
57cedb18c0 cmSystemTools: std::string parameters for tar functions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3392
Diffstat (limited to 'Source/cmcmd.cxx')
-rw-r--r--Source/cmcmd.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index e37dbe8..f4ef45c 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -1130,7 +1130,7 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string> const& args)
return 1;
}
if (action == cmSystemTools::TarActionList) {
- if (!cmSystemTools::ListTar(outFile.c_str(), files, verbose)) {
+ if (!cmSystemTools::ListTar(outFile, files, verbose)) {
cmSystemTools::Error("Problem listing tar: " + outFile);
return 1;
}
@@ -1139,13 +1139,13 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string> const& args)
cmSystemTools::Message("tar: No files or directories specified",
"Warning");
}
- if (!cmSystemTools::CreateTar(outFile.c_str(), files, compress,
- verbose, mtime, format)) {
+ if (!cmSystemTools::CreateTar(outFile, files, compress, verbose, mtime,
+ format)) {
cmSystemTools::Error("Problem creating tar: " + outFile);
return 1;
}
} else if (action == cmSystemTools::TarActionExtract) {
- if (!cmSystemTools::ExtractTar(outFile.c_str(), files, verbose)) {
+ if (!cmSystemTools::ExtractTar(outFile, files, verbose)) {
cmSystemTools::Error("Problem extracting tar: " + outFile);
return 1;
}