diff options
| author | Ben Boeckel <ben.boeckel@kitware.com> | 2023-07-26 19:40:56 (GMT) |
|---|---|---|
| committer | Ben Boeckel <ben.boeckel@kitware.com> | 2023-07-30 22:33:07 (GMT) |
| commit | 1b60137b98b26866c84ca29aee62031d429f34a5 (patch) | |
| tree | b1f89ba1b5dc7dcae93df9a100b4fcccb68ef550 /Source/CPack | |
| parent | e1b70d7286d8a53b5046b1fb5e2b042333f5b736 (diff) | |
| download | CMake-1b60137b98b26866c84ca29aee62031d429f34a5.zip CMake-1b60137b98b26866c84ca29aee62031d429f34a5.tar.gz CMake-1b60137b98b26866c84ca29aee62031d429f34a5.tar.bz2 | |
strings: combine string literals
Diffstat (limited to 'Source/CPack')
| -rw-r--r-- | Source/CPack/cmCPackBundleGenerator.cxx | 20 | ||||
| -rw-r--r-- | Source/CPack/cmCPackProductBuildGenerator.cxx | 28 |
2 files changed, 32 insertions, 16 deletions
diff --git a/Source/CPack/cmCPackBundleGenerator.cxx b/Source/CPack/cmCPackBundleGenerator.cxx index dad404a..37be798 100644 --- a/Source/CPack/cmCPackBundleGenerator.cxx +++ b/Source/CPack/cmCPackBundleGenerator.cxx @@ -86,24 +86,28 @@ int cmCPackBundleGenerator::ConstructBundle() std::string const staging = toplevel; std::ostringstream contents; - contents << staging << "/" << cpack_bundle_name << ".app/" - << "Contents"; + contents << staging << "/" << cpack_bundle_name + << ".app/" + "Contents"; std::ostringstream application; - application << contents.str() << "/" - << "MacOS"; + application << contents.str() + << "/" + "MacOS"; std::ostringstream resources; - resources << contents.str() << "/" - << "Resources"; + resources << contents.str() + << "/" + "Resources"; // Install a required, user-provided bundle metadata file ... std::ostringstream plist_source; plist_source << cpack_bundle_plist; std::ostringstream plist_target; - plist_target << contents.str() << "/" - << "Info.plist"; + plist_target << contents.str() + << "/" + "Info.plist"; if (!this->CopyFile(plist_source, plist_target)) { cmCPackLogger( diff --git a/Source/CPack/cmCPackProductBuildGenerator.cxx b/Source/CPack/cmCPackProductBuildGenerator.cxx index 843219d..fd3c659 100644 --- a/Source/CPack/cmCPackProductBuildGenerator.cxx +++ b/Source/CPack/cmCPackProductBuildGenerator.cxx @@ -102,10 +102,15 @@ int cmCPackProductBuildGenerator::PackageFiles() pkgCmd << productbuild << " --distribution \"" << packageDirFileName << "/Contents/distribution.dist\"" - << " --package-path \"" << packageDirFileName << "/Contents/Packages" + " --package-path \"" + << packageDirFileName + << "/Contents/Packages" + "\"" + " --resources \"" + << resDir << "\"" - << " --resources \"" << resDir << "\"" - << " --version \"" << version << "\"" + " --version \"" + << version << "\"" << (identifier.empty() ? std::string{} : cmStrCat(" --identifier \"", identifier, '"')) @@ -236,11 +241,18 @@ bool cmCPackProductBuildGenerator::GenerateComponentPackage( keychainPath = p; } - pkgCmd << pkgbuild << " --root \"" << packageDir << "\"" - << " --identifier \"" << pkgId << "\"" - << " --scripts \"" << scriptDir << "\"" - << " --version \"" << version << "\"" - << " --install-location \"/\"" + pkgCmd << pkgbuild << " --root \"" << packageDir + << "\"" + " --identifier \"" + << pkgId + << "\"" + " --scripts \"" + << scriptDir + << "\"" + " --version \"" + << version + << "\"" + " --install-location \"/\"" << (identityName.empty() ? std::string{} : cmStrCat(" --sign \"", identityName, "\"")) << (keychainPath.empty() |