summaryrefslogtreecommitdiffstats
path: root/Source/CPack
diff options
context:
space:
mode:
authorBen Boeckel <ben.boeckel@kitware.com>2023-07-27 18:39:37 (GMT)
committerBen Boeckel <ben.boeckel@kitware.com>2023-07-27 23:10:39 (GMT)
commita5ba00bdf875cb1290b90abb8c9f55c1b7f88876 (patch)
treeacfcd3adec5158ed3c5eb4882ee05fb4d1bf6bfa /Source/CPack
parent3f1378fbcab72a849908bbc988254f392d04c41a (diff)
downloadCMake-a5ba00bdf875cb1290b90abb8c9f55c1b7f88876.zip
CMake-a5ba00bdf875cb1290b90abb8c9f55c1b7f88876.tar.gz
CMake-a5ba00bdf875cb1290b90abb8c9f55c1b7f88876.tar.bz2
strings: combine string literals where possible
Diffstat (limited to 'Source/CPack')
-rw-r--r--Source/CPack/WiX/cmCPackWIXGenerator.cxx13
1 files changed, 8 insertions, 5 deletions
diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
index 2330935..45f91b2 100644
--- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx
+++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
@@ -104,8 +104,9 @@ bool cmCPackWIXGenerator::RunCandleCommand(std::string const& sourceFile,
std::ostringstream command;
command << QuotePath(executable);
- command << " -nologo";
- command << " -arch " << arch;
+ command << " -nologo"
+ " -arch "
+ << arch;
command << " -out " << QuotePath(objectFile);
for (std::string const& ext : CandleExtensions) {
@@ -132,8 +133,9 @@ bool cmCPackWIXGenerator::RunLightCommand(std::string const& objectFiles)
std::ostringstream command;
command << QuotePath(executable);
- command << " -nologo";
- command << " -out " << QuotePath(CMakeToWixPath(packageFileNames.at(0)));
+ command << " -nologo"
+ " -out "
+ << QuotePath(CMakeToWixPath(packageFileNames.at(0)));
for (std::string const& ext : this->LightExtensions) {
command << " -ext " << QuotePath(ext);
@@ -1183,7 +1185,8 @@ void cmCPackWIXGenerator::CollectXmlNamespaces(std::string const& variableName,
} else {
cmCPackLogger(cmCPackLog::LOG_ERROR,
"Invalid element in CPACK_WIX_CUSTOM_XMLNS ignored: "
- << "\"" << str << "\"" << std::endl);
+ "\""
+ << str << "\"" << std::endl);
}
}
std::ostringstream oss;