diff options
| author | Brad King <brad.king@kitware.com> | 2022-07-01 12:19:28 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-07-01 12:19:36 (GMT) |
| commit | 34d746e4190f2c33a3fcfe35103981d20cb9b2c6 (patch) | |
| tree | a5c4f200c95e67184dd3efe3a4fdbea12bf19110 /Source | |
| parent | 113fbaf3e29d36827ca7242b8be3e5ee5b319d17 (diff) | |
| parent | 8bd98b8117c31ee797b33fbf04ebfc03942ea15e (diff) | |
| download | CMake-34d746e4190f2c33a3fcfe35103981d20cb9b2c6.zip CMake-34d746e4190f2c33a3fcfe35103981d20cb9b2c6.tar.gz CMake-34d746e4190f2c33a3fcfe35103981d20cb9b2c6.tar.bz2 | |
Merge topic 'genex-TARGET_BUNDLE_DIR_NAME'
8bd98b8117 Genex: Fix TARGET_BUNDLE_DIR_NAME incorrect extension
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7428
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGeneratorExpressionNode.cxx | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx index b08cddb..d773fdf 100644 --- a/Source/cmGeneratorExpressionNode.cxx +++ b/Source/cmGeneratorExpressionNode.cxx @@ -2763,8 +2763,18 @@ struct TargetFilesystemArtifactResultCreator<ArtifactBundleDirNameTag> return std::string(); } - return target->GetAppBundleDirectory(context->Config, - cmGeneratorTarget::BundleDirLevel); + auto level = cmGeneratorTarget::BundleDirLevel; + auto config = context->Config; + if (target->IsAppBundleOnApple()) { + return target->GetAppBundleDirectory(config, level); + } + if (target->IsFrameworkOnApple()) { + return target->GetFrameworkDirectory(config, level); + } + if (target->IsCFBundleOnApple()) { + return target->GetCFBundleDirectory(config, level); + } + return std::string(); } }; |