diff options
| author | Brad King <brad.king@kitware.com> | 2020-10-16 16:12:26 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-12-10 12:06:20 (GMT) |
| commit | 24156c02696b686ed38f431c30e7faf24a561ddb (patch) | |
| tree | b83f27937adcefa00eacc6e27e8097c3977b55f0 /Source/cmCustomCommandGenerator.cxx | |
| parent | b285748f79b642f3ab970912bc4512ded2f18124 (diff) | |
| download | CMake-24156c02696b686ed38f431c30e7faf24a561ddb.zip CMake-24156c02696b686ed38f431c30e7faf24a561ddb.tar.gz CMake-24156c02696b686ed38f431c30e7faf24a561ddb.tar.bz2 | |
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
Diffstat (limited to 'Source/cmCustomCommandGenerator.cxx')
| -rw-r--r-- | Source/cmCustomCommandGenerator.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
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<std::string> const& cmCustomCommandGenerator::GetOutputs() const { - return this->CC->GetOutputs(); + return this->Outputs; } std::vector<std::string> const& cmCustomCommandGenerator::GetByproducts() const |