mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-22 14:23:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

strings: combine string literals where possible

Browse Source
This commit is contained in:
Ben Boeckel
2023-07-27 14:39:37 -04:00
parent 3f1378fbca
commit a5ba00bdf8
7 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/CPack/WiX/cmCPackWIXGenerator.cxx
+8 -5
View File
@@ -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;