summaryrefslogtreecommitdiffstats
path: root/Source/CPack/cmCPackPackageMakerGenerator.cxx
diff options
context:
space:
mode:
authorGregor Jasny <gjasny@googlemail.com>2016-09-04 14:55:05 (GMT)
committerGregor Jasny <gjasny@googlemail.com>2016-09-04 14:55:05 (GMT)
commit60dcaaea133931a323180c30eafabe4576e72cb8 (patch)
tree4f1e8855334fe41b9d98076a7c81c0963c0a526d /Source/CPack/cmCPackPackageMakerGenerator.cxx
parentfb357e5fef2e7803f2f745b6aa4cf63935628ed6 (diff)
downloadCMake-60dcaaea133931a323180c30eafabe4576e72cb8.zip
CMake-60dcaaea133931a323180c30eafabe4576e72cb8.tar.gz
CMake-60dcaaea133931a323180c30eafabe4576e72cb8.tar.bz2
tidy: Fix readability-redundant-string-cstr issues
Diffstat (limited to 'Source/CPack/cmCPackPackageMakerGenerator.cxx')
-rw-r--r--Source/CPack/cmCPackPackageMakerGenerator.cxx16
1 files changed, 8 insertions, 8 deletions
diff --git a/Source/CPack/cmCPackPackageMakerGenerator.cxx b/Source/CPack/cmCPackPackageMakerGenerator.cxx
index ce329ca..0704e9f 100644
--- a/Source/CPack/cmCPackPackageMakerGenerator.cxx
+++ b/Source/CPack/cmCPackPackageMakerGenerator.cxx
@@ -118,13 +118,13 @@ int cmCPackPackageMakerGenerator::PackageFiles()
// then copy them into the resource directory and make
// them executable
if (preflight) {
- this->CopyInstallScript(resDir.c_str(), preflight, "preflight");
+ this->CopyInstallScript(resDir, preflight, "preflight");
}
if (postflight) {
- this->CopyInstallScript(resDir.c_str(), postflight, "postflight");
+ this->CopyInstallScript(resDir, postflight, "postflight");
}
if (postupgrade) {
- this->CopyInstallScript(resDir.c_str(), postupgrade, "postupgrade");
+ this->CopyInstallScript(resDir, postupgrade, "postupgrade");
}
} else if (postflight) {
// create a postflight component to house the script
@@ -160,7 +160,7 @@ int cmCPackPackageMakerGenerator::PackageFiles()
// copy postflight script into resource directory of .pkg
std::string resourceDir = packageFile + "/Contents/Resources";
- this->CopyInstallScript(resourceDir.c_str(), postflight, "postflight");
+ this->CopyInstallScript(resourceDir, postflight, "postflight");
}
if (!this->Components.empty()) {
@@ -254,9 +254,9 @@ int cmCPackPackageMakerGenerator::PackageFiles()
this->SetOption("CPACK_MODULE_VERSION_SUFFIX", "");
// Copy or create all of the resource files we need.
- if (!this->CopyCreateResourceFile("License", resDir.c_str()) ||
- !this->CopyCreateResourceFile("ReadMe", resDir.c_str()) ||
- !this->CopyCreateResourceFile("Welcome", resDir.c_str()) ||
+ if (!this->CopyCreateResourceFile("License", resDir) ||
+ !this->CopyCreateResourceFile("ReadMe", resDir) ||
+ !this->CopyCreateResourceFile("Welcome", resDir) ||
!this->CopyResourcePlistFile("Info.plist") ||
!this->CopyResourcePlistFile("Description.plist")) {
cmCPackLogger(cmCPackLog::LOG_ERROR, "Problem copying the resource files"
@@ -372,7 +372,7 @@ int cmCPackPackageMakerGenerator::InitializeInternal()
}
// Get path to the real PackageMaker, not a symlink:
- pkgPath = cmSystemTools::GetRealPath(pkgPath.c_str());
+ pkgPath = cmSystemTools::GetRealPath(pkgPath);
// Up from there to find the version.plist file in the "Contents" dir:
std::string contents_dir;
contents_dir = cmSystemTools::GetFilenamePath(pkgPath);