diff options
| author | Marc Chevrier <marc.chevrier@gmail.com> | 2021-09-14 16:47:30 (GMT) |
|---|---|---|
| committer | Marc Chevrier <marc.chevrier@gmail.com> | 2021-09-15 16:30:49 (GMT) |
| commit | 7fce78982bbd199e2c34cfec75fca7605f32f43b (patch) | |
| tree | 12677805b179c352abfcbde5096f6af53884dfdc /Source/CPack/cmCPackOSXX11Generator.cxx | |
| parent | 7aeb2622789d04e57051f3592908c5f27d31bb17 (diff) | |
| download | CMake-7fce78982bbd199e2c34cfec75fca7605f32f43b.zip CMake-7fce78982bbd199e2c34cfec75fca7605f32f43b.tar.gz CMake-7fce78982bbd199e2c34cfec75fca7605f32f43b.tar.bz2 | |
Use new SetOption signatures
Diffstat (limited to 'Source/CPack/cmCPackOSXX11Generator.cxx')
| -rw-r--r-- | Source/CPack/cmCPackOSXX11Generator.cxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Source/CPack/cmCPackOSXX11Generator.cxx b/Source/CPack/cmCPackOSXX11Generator.cxx index 262cc6e..8291752 100644 --- a/Source/CPack/cmCPackOSXX11Generator.cxx +++ b/Source/CPack/cmCPackOSXX11Generator.cxx @@ -46,8 +46,7 @@ int cmCPackOSXX11Generator::PackageFiles() it != cpackPackageExecutablesVector.end(); ++it) { std::string cpackExecutableName = *it; ++it; - this->SetOptionIfNotSet("CPACK_EXECUTABLE_NAME", - cpackExecutableName.c_str()); + this->SetOptionIfNotSet("CPACK_EXECUTABLE_NAME", cpackExecutableName); } } @@ -84,7 +83,7 @@ int cmCPackOSXX11Generator::PackageFiles() } std::string destFileName = resourcesDirectory + "/" + iconFileName; this->ConfigureFile(iconFile, destFileName, true); - this->SetOptionIfNotSet("CPACK_APPLE_GUI_ICON", iconFileName.c_str()); + this->SetOptionIfNotSet("CPACK_APPLE_GUI_ICON", iconFileName); } std::string applicationsLinkName = diskImageDirectory + "/Applications"; @@ -191,8 +190,7 @@ int cmCPackOSXX11Generator::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(); } |