Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-20 04:24:36 +08:00
Code Issues Projects Releases Wiki Activity

VS: Clarify name of custom commands AdditionalInputs variable

Browse Source
This commit is contained in:
Frans van Dorsselaer
2019-05-28 15:53:13 +02:00
committed by Brad King
parent fcedf8e552
commit d03a6fc857
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Source/cmVisualStudio10TargetGenerator.cxx
View File

@@ -1353,14 +1353,14 @@ void cmVisualStudio10TargetGenerator::WriteCustomRule(
comment = cmVS10EscapeComment(comment); comment = cmVS10EscapeComment(comment);
std::string script = lg->ConstructScript(ccg); std::string script = lg->ConstructScript(ccg);
// input files for custom command // 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()) { for (std::string const& d : ccg.GetDepends()) {
std::string dep; std::string dep;
if (lg->GetRealDependency(d, c, dep)) { if (lg->GetRealDependency(d, c, dep)) {
ConvertToWindowsSlash(dep); ConvertToWindowsSlash(dep);
inputs << ";" << dep; additional_inputs << ";" << dep;
} }
} }
} }
@@ -1378,25 +1378,25 @@ void cmVisualStudio10TargetGenerator::WriteCustomRule(
if (this->ProjectType == csproj) { if (this->ProjectType == csproj) {
std::string name = "CustomCommand_" + c + "_" + std::string name = "CustomCommand_" + c + "_" +
cmSystemTools::ComputeStringMD5(sourcePath); cmSystemTools::ComputeStringMD5(sourcePath);
this->WriteCustomRuleCSharp(e0, c, name, script, inputs.str(), this->WriteCustomRuleCSharp(e0, c, name, script, additional_inputs.str(),
outputs.str(), comment); outputs.str(), comment);
} else { } else {
this->WriteCustomRuleCpp(*spe2, c, script, inputs.str(), outputs.str(), this->WriteCustomRuleCpp(*spe2, c, script, additional_inputs.str(),
comment); outputs.str(), comment);
} }
} }
} }
void cmVisualStudio10TargetGenerator::WriteCustomRuleCpp( void cmVisualStudio10TargetGenerator::WriteCustomRuleCpp(
Elem& e2, std::string const& config, std::string const& script, 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) std::string const& comment)
{ {
const std::string cond = this->CalcCondition(config); const std::string cond = this->CalcCondition(config);
e2.WritePlatformConfigTag("Message", cond, comment); e2.WritePlatformConfigTag("Message", cond, comment);
e2.WritePlatformConfigTag("Command", cond, script); e2.WritePlatformConfigTag("Command", cond, script);
e2.WritePlatformConfigTag("AdditionalInputs", cond, e2.WritePlatformConfigTag("AdditionalInputs", cond,
inputs + ";%(AdditionalInputs)"); additional_inputs + ";%(AdditionalInputs)");
e2.WritePlatformConfigTag("Outputs", cond, outputs); e2.WritePlatformConfigTag("Outputs", cond, outputs);
if (this->LocalGenerator->GetVersion() > if (this->LocalGenerator->GetVersion() >
cmGlobalVisualStudioGenerator::VS10) { cmGlobalVisualStudioGenerator::VS10) {

3
Source/cmVisualStudio10TargetGenerator.h
View File

@@ -135,7 +135,8 @@ private:
void WriteCustomRule(Elem& e0, cmSourceFile const* source, void WriteCustomRule(Elem& e0, cmSourceFile const* source,
cmCustomCommand const& command); cmCustomCommand const& command);
void WriteCustomRuleCpp(Elem& e2, std::string const& config, 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& outputs,
std::string const& comment); std::string const& comment);
void WriteCustomRuleCSharp(Elem& e0, std::string const& config, void WriteCustomRuleCSharp(Elem& e0, std::string const& config,