summaryrefslogtreecommitdiffstats
path: root/Source/cmVisualStudio10TargetGenerator.cxx
diff options
context:
space:
mode:
authorFrans van Dorsselaer <frans.vandorsselaer@foxcrypto.com>2019-05-28 13:53:13 (GMT)
committerBrad King <brad.king@kitware.com>2019-05-30 17:57:03 (GMT)
commitd03a6fc8578ac2b4191a74c8638d58b7f92ec6f1 (patch)
treedb9f9466e07c6702ec35d333a6ed10ef505701be /Source/cmVisualStudio10TargetGenerator.cxx
parentfcedf8e5528d711f1e4b765809da018d5adb2abd (diff)
downloadCMake-d03a6fc8578ac2b4191a74c8638d58b7f92ec6f1.zip
CMake-d03a6fc8578ac2b4191a74c8638d58b7f92ec6f1.tar.gz
CMake-d03a6fc8578ac2b4191a74c8638d58b7f92ec6f1.tar.bz2
VS: Clarify name of custom commands AdditionalInputs variable
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
-rw-r--r--Source/cmVisualStudio10TargetGenerator.cxx16
1 files changed, 8 insertions, 8 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 3f0d41d..0405222 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -1353,14 +1353,14 @@ void cmVisualStudio10TargetGenerator::WriteCustomRule(
comment = cmVS10EscapeComment(comment);
std::string script = lg->ConstructScript(ccg);
// input files for custom command
- std::stringstream inputs;
+ std::stringstream additional_inputs;
{
- inputs << source->GetFullPath();
+ additional_inputs << source->GetFullPath();
for (std::string const& d : ccg.GetDepends()) {
std::string dep;
if (lg->GetRealDependency(d, c, dep)) {
ConvertToWindowsSlash(dep);
- inputs << ";" << dep;
+ additional_inputs << ";" << dep;
}
}
}
@@ -1378,25 +1378,25 @@ void cmVisualStudio10TargetGenerator::WriteCustomRule(
if (this->ProjectType == csproj) {
std::string name = "CustomCommand_" + c + "_" +
cmSystemTools::ComputeStringMD5(sourcePath);
- this->WriteCustomRuleCSharp(e0, c, name, script, inputs.str(),
+ this->WriteCustomRuleCSharp(e0, c, name, script, additional_inputs.str(),
outputs.str(), comment);
} else {
- this->WriteCustomRuleCpp(*spe2, c, script, inputs.str(), outputs.str(),
- comment);
+ this->WriteCustomRuleCpp(*spe2, c, script, additional_inputs.str(),
+ outputs.str(), comment);
}
}
}
void cmVisualStudio10TargetGenerator::WriteCustomRuleCpp(
Elem& e2, std::string const& config, std::string const& script,
- std::string const& inputs, std::string const& outputs,
+ std::string const& additional_inputs, std::string const& outputs,
std::string const& comment)
{
const std::string cond = this->CalcCondition(config);
e2.WritePlatformConfigTag("Message", cond, comment);
e2.WritePlatformConfigTag("Command", cond, script);
e2.WritePlatformConfigTag("AdditionalInputs", cond,
- inputs + ";%(AdditionalInputs)");
+ additional_inputs + ";%(AdditionalInputs)");
e2.WritePlatformConfigTag("Outputs", cond, outputs);
if (this->LocalGenerator->GetVersion() >
cmGlobalVisualStudioGenerator::VS10) {