mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-09 10:00:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

strings: simplify streaming sequences

Browse Source
This commit is contained in:
Ben Boeckel
2023-07-27 14:57:48 -04:00
parent a5ba00bdf8
commit 2409f62d18
3 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Source/CPack/WiX/cmCPackWIXGenerator.cxx
View File

@@ -103,11 +103,10 @@ bool cmCPackWIXGenerator::RunCandleCommand(std::string const& sourceFile,
}
std::ostringstream command;
command << QuotePath(executable);
command << " -nologo"
command << QuotePath(executable)
<< " -nologo"
" -arch "
<< arch;
command << " -out " << QuotePath(objectFile);
<< arch << " -out " << QuotePath(objectFile);
for (std::string const& ext : CandleExtensions) {
command << " -ext " << QuotePath(ext);
@@ -132,8 +131,8 @@ bool cmCPackWIXGenerator::RunLightCommand(std::string const& objectFiles)
}
std::ostringstream command;
command << QuotePath(executable);
command << " -nologo"
command << QuotePath(executable)
<< " -nologo"
" -out "
<< QuotePath(CMakeToWixPath(packageFileNames.at(0)));

4
Source/cmGlobalVisualStudioGenerator.cxx
View File

@@ -286,8 +286,8 @@ void cmGlobalVisualStudioGenerator::ConfigureCMakeVisualStudioMacros()
if (!cmSystemTools::FileTimeCompare(src, dst, &res) || res > 0) {
if (!cmSystemTools::CopyFileAlways(src, dst)) {
std::ostringstream oss;
oss << "Could not copy from: " << src << std::endl;
oss << " to: " << dst << std::endl;
oss << "Could not copy from: " << src << std::endl
<< " to: " << dst << std::endl;
cmSystemTools::Message(oss.str(), "Warning");
}
}

9
Source/cmVisualStudio10TargetGenerator.cxx
View File

@@ -304,15 +304,14 @@ std::string cmVisualStudio10TargetGenerator::CalcCondition(
const std::string& config) const
{
std::ostringstream oss;
oss << "'$(Configuration)|$(Platform)'=='";
oss << config << "|" << this->Platform;
oss << "'";
oss << "'$(Configuration)|$(Platform)'=='" << config << "|" << this->Platform
<< "'";
// handle special case for 32 bit C# targets
if (this->ProjectType == VsProjectType::csproj &&
this->Platform == "Win32"_s) {
oss << " Or "
"'$(Configuration)|$(Platform)'=='";
oss << config
"'$(Configuration)|$(Platform)'=='"
<< config
<< "|x86"
"'";
}