mirror of
https://github.com/Kitware/CMake.git
synced 2026-01-06 05:40:54 -06:00
Merge topic 'xcode-embed-plugins'
9e1e7dc7db Xcode: Add embedded plugins option
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6690
This commit is contained in:
@@ -3910,6 +3910,14 @@ void cmGlobalXCodeGenerator::AddEmbeddedFrameworks(cmXCodeObject* target)
|
||||
NoActionOnCopyByDefault);
|
||||
}
|
||||
|
||||
void cmGlobalXCodeGenerator::AddEmbeddedPlugIns(cmXCodeObject* target)
|
||||
{
|
||||
static const auto dstSubfolderSpec = "13";
|
||||
|
||||
this->AddEmbeddedObjects(target, "Embed PlugIns", "XCODE_EMBED_PLUGINS",
|
||||
dstSubfolderSpec, NoActionOnCopyByDefault);
|
||||
}
|
||||
|
||||
void cmGlobalXCodeGenerator::AddEmbeddedAppExtensions(cmXCodeObject* target)
|
||||
{
|
||||
static const auto dstSubfolderSpec = "13";
|
||||
@@ -4298,6 +4306,7 @@ bool cmGlobalXCodeGenerator::CreateXCodeObjects(
|
||||
for (auto t : targets) {
|
||||
this->AddDependAndLinkInformation(t);
|
||||
this->AddEmbeddedFrameworks(t);
|
||||
this->AddEmbeddedPlugIns(t);
|
||||
this->AddEmbeddedAppExtensions(t);
|
||||
// Inherit project-wide values for any target-specific search paths.
|
||||
this->InheritBuildSettingAttribute(t, "HEADER_SEARCH_PATHS");
|
||||
|
||||
@@ -216,6 +216,7 @@ private:
|
||||
const std::string& dstSubfolderSpec,
|
||||
int actionsOnByDefault);
|
||||
void AddEmbeddedFrameworks(cmXCodeObject* target);
|
||||
void AddEmbeddedPlugIns(cmXCodeObject* target);
|
||||
void AddEmbeddedAppExtensions(cmXCodeObject* target);
|
||||
void AddPositionIndependentLinkAttribute(cmGeneratorTarget* target,
|
||||
cmXCodeObject* buildSettings,
|
||||
|
||||
Reference in New Issue
Block a user