summaryrefslogtreecommitdiffstats
path: root/Source/CPack/cmCPackPackageMakerGenerator.cxx
diff options
context:
space:
mode:
authorMarc Chevrier <marc.chevrier@gmail.com>2021-09-14 16:47:30 (GMT)
committerMarc Chevrier <marc.chevrier@gmail.com>2021-09-15 16:30:49 (GMT)
commit7fce78982bbd199e2c34cfec75fca7605f32f43b (patch)
tree12677805b179c352abfcbde5096f6af53884dfdc /Source/CPack/cmCPackPackageMakerGenerator.cxx
parent7aeb2622789d04e57051f3592908c5f27d31bb17 (diff)
downloadCMake-7fce78982bbd199e2c34cfec75fca7605f32f43b.zip
CMake-7fce78982bbd199e2c34cfec75fca7605f32f43b.tar.gz
CMake-7fce78982bbd199e2c34cfec75fca7605f32f43b.tar.bz2
Use new SetOption signatures
Diffstat (limited to 'Source/CPack/cmCPackPackageMakerGenerator.cxx')
-rw-r--r--Source/CPack/cmCPackPackageMakerGenerator.cxx8
1 files changed, 3 insertions, 5 deletions
diff --git a/Source/CPack/cmCPackPackageMakerGenerator.cxx b/Source/CPack/cmCPackPackageMakerGenerator.cxx
index 33b601c..2915616 100644
--- a/Source/CPack/cmCPackPackageMakerGenerator.cxx
+++ b/Source/CPack/cmCPackPackageMakerGenerator.cxx
@@ -362,7 +362,7 @@ int cmCPackPackageMakerGenerator::InitializeInternal()
"Cannot find PackageMaker compiler" << std::endl);
return 0;
}
- this->SetOptionIfNotSet("CPACK_INSTALLER_PROGRAM", pkgPath.c_str());
+ this->SetOptionIfNotSet("CPACK_INSTALLER_PROGRAM", pkgPath);
}
// Get path to the real PackageMaker, not a symlink:
@@ -455,8 +455,7 @@ int cmCPackPackageMakerGenerator::InitializeInternal()
"Cannot find hdiutil compiler" << std::endl);
return 0;
}
- this->SetOptionIfNotSet("CPACK_INSTALLER_PROGRAM_DISK_IMAGE",
- pkgPath.c_str());
+ this->SetOptionIfNotSet("CPACK_INSTALLER_PROGRAM_DISK_IMAGE", pkgPath);
return this->Superclass::InitializeInternal();
}
@@ -544,8 +543,7 @@ bool cmCPackPackageMakerGenerator::GenerateComponentPackage(
// Create the Info.plist file for this component
std::string moduleVersionSuffix = cmStrCat('.', component.Name);
- this->SetOption("CPACK_MODULE_VERSION_SUFFIX",
- moduleVersionSuffix.c_str());
+ this->SetOption("CPACK_MODULE_VERSION_SUFFIX", moduleVersionSuffix);
std::string infoFileName = cmStrCat(component.Name, "-Info.plist");
if (!this->CopyResourcePlistFile("Info.plist", infoFileName.c_str())) {
return false;