diff options
| author | Asit Dhal <dhal.asitk@gmail.com> | 2021-01-11 17:14:55 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-01-26 17:13:15 (GMT) |
| commit | 64c3857780e7b7595e0ce96e1081dcda835910b1 (patch) | |
| tree | 1ef823ef06aaf9221b1a20e2ae37387481c8c7d1 /Source | |
| parent | 72974fe3392630c3df7805c9ec641898b7dd128b (diff) | |
| download | CMake-64c3857780e7b7595e0ce96e1081dcda835910b1.zip CMake-64c3857780e7b7595e0ce96e1081dcda835910b1.tar.gz CMake-64c3857780e7b7595e0ce96e1081dcda835910b1.tar.bz2 | |
OUTPUT_DIRECTORY: Support tgt genex in output artifact vars
Following variables now support target dependent generator expressions.
- CMAKE_RUNTIME_OUTPUT_DIRECTORY
- CMAKE_LIBRARY_OUTPUT_DIRECTORY
- CMAKE_ARCHIVE_OUTPUT_DIRECTORY
Fixes: #18055
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) { |