diff options
| author | Frans van Dorsselaer <frans.vandorsselaer@foxcrypto.com> | 2019-05-28 15:53:13 +0200 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-05-30 13:57:03 -0400 |
| commit | d03a6fc8578ac2b4191a74c8638d58b7f92ec6f1 (patch) | |
| tree | db9f9466e07c6702ec35d333a6ed10ef505701be | |
| parent | fcedf8e5528d711f1e4b765809da018d5adb2abd (diff) | |
| download | cmake-d03a6fc8578ac2b4191a74c8638d58b7f92ec6f1.tar.gz | |
VS: Clarify name of custom commands AdditionalInputs variable
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 16 | ||||
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.h | 3 |
2 files changed, 10 insertions, 9 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 3f0d41d493..04052220ed 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) { diff --git a/Source/cmVisualStudio10TargetGenerator.h b/Source/cmVisualStudio10TargetGenerator.h index 590100496d..68db332e15 100644 --- a/Source/cmVisualStudio10TargetGenerator.h +++ b/Source/cmVisualStudio10TargetGenerator.h @@ -135,7 +135,8 @@ private: void WriteCustomRule(Elem& e0, cmSourceFile const* source, cmCustomCommand const& command); void WriteCustomRuleCpp(Elem& e2, std::string const& config, - std::string const& script, std::string const& inputs, + std::string const& script, + std::string const& additional_inputs, std::string const& outputs, std::string const& comment); void WriteCustomRuleCSharp(Elem& e0, std::string const& config, |