diff options
| author | Brad King <brad.king@kitware.com> | 2021-01-27 14:04:21 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-01-27 14:04:29 (GMT) |
| commit | f39fb0b90de7002d2f66d118669a664540c6be7c (patch) | |
| tree | 50beefad5bf15fa7ce1481094958ba56162cd648 /Source | |
| parent | 977811a8ff39d0f02048093e34c38debaffc2cd7 (diff) | |
| parent | 64c3857780e7b7595e0ce96e1081dcda835910b1 (diff) | |
| download | CMake-f39fb0b90de7002d2f66d118669a664540c6be7c.zip CMake-f39fb0b90de7002d2f66d118669a664540c6be7c.tar.gz CMake-f39fb0b90de7002d2f66d118669a664540c6be7c.tar.bz2 | |
Merge topic 'outdir-target-genex'
64c3857780 OUTPUT_DIRECTORY: Support tgt genex in output artifact vars
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5690
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGeneratorTarget.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index 17d211e..a96103a 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -6491,15 +6491,14 @@ bool cmGeneratorTarget::ComputeOutputDir(const std::string& config, if (cmProp config_outdir = this->GetProperty(configProp)) { // Use the user-specified per-configuration output directory. out = cmGeneratorExpression::Evaluate(*config_outdir, this->LocalGenerator, - config); + config, this); // Skip per-configuration subdirectory. conf.clear(); } else if (cmProp outdir = this->GetProperty(propertyName)) { // Use the user-specified output directory. - out = - cmGeneratorExpression::Evaluate(*outdir, this->LocalGenerator, config); - + out = cmGeneratorExpression::Evaluate(*outdir, this->LocalGenerator, + config, this); // Skip per-configuration subdirectory if the value contained a // generator expression. if (out != *outdir) { |