From 24156c02696b686ed38f431c30e7faf24a561ddb Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 16 Oct 2020 12:12:26 -0400 Subject: cmCustomCommandGenerator: Evaluate generator expressions in outputs This was already done for byproducts by commit a583b7bc17 (Genex: Evaluate byproduct generator expressions in cmCustomCommandGenerator, 2019-09-11, v3.16.0-rc1~86^2). Like that commit, this does not actually expose the feature to projects because the front-end commands still reject generator expressions. Issue: #12877 --- Source/cmCustomCommandGenerator.cxx | 3 ++- Source/cmCustomCommandGenerator.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Source/cmCustomCommandGenerator.cxx b/Source/cmCustomCommandGenerator.cxx index 08a0574..5970709 100644 --- a/Source/cmCustomCommandGenerator.cxx +++ b/Source/cmCustomCommandGenerator.cxx @@ -121,6 +121,7 @@ cmCustomCommandGenerator::cmCustomCommandGenerator(cmCustomCommand const& cc, this->CommandLines.push_back(std::move(argv)); } + AppendPaths(cc.GetOutputs(), ge, this->LG, this->Config, this->Outputs); AppendPaths(cc.GetByproducts(), ge, this->LG, this->Config, this->Byproducts); AppendPaths(cc.GetDepends(), ge, this->LG, this->Config, this->Depends); @@ -326,7 +327,7 @@ std::string cmCustomCommandGenerator::GetWorkingDirectory() const std::vector const& cmCustomCommandGenerator::GetOutputs() const { - return this->CC->GetOutputs(); + return this->Outputs; } std::vector const& cmCustomCommandGenerator::GetByproducts() const diff --git a/Source/cmCustomCommandGenerator.h b/Source/cmCustomCommandGenerator.h index cb0d7df..dac3596 100644 --- a/Source/cmCustomCommandGenerator.h +++ b/Source/cmCustomCommandGenerator.h @@ -24,6 +24,7 @@ class cmCustomCommandGenerator bool MakeVars; cmCustomCommandLines CommandLines; std::vector> EmulatorsWithArguments; + std::vector Outputs; std::vector Byproducts; std::vector Depends; std::string WorkingDirectory; -- cgit v0.12