Xcode: Fix embed resources prop name

Fix commit e40d2cb3af (Xcode: Add embed resources support, 2023-07-31,
v3.28.0-rc1~281^2).  The implementation should not name the `_PATH`
suffix explicitly.  That variant is automatically handled by
`cmGlobalXCodeGenerator::AddEmbeddedObjects`.
This commit is contained in:
halx99
2023-11-28 23:53:23 +08:00
committed by Brad King
parent 01deb58098
commit 6030df205a
3 changed files with 4 additions and 5 deletions

View File

@@ -41,7 +41,7 @@ The supported values for ``<type>`` are:
.. versionadded:: 3.28
The specified items will be added to the ``Embed Resources`` build phase.
They must be CMake target names.
They must be CMake target names or folder paths.
See also :prop_tgt:`XCODE_EMBED_<type>_PATH`,
:prop_tgt:`XCODE_EMBED_<type>_REMOVE_HEADERS_ON_COPY` and

View File

@@ -4273,9 +4273,8 @@ void cmGlobalXCodeGenerator::AddEmbeddedResources(cmXCodeObject* target)
{
static const auto dstSubfolderSpec = "7";
this->AddEmbeddedObjects(target, "Embed Resources",
"XCODE_EMBED_RESOURCES_PATH", dstSubfolderSpec,
NoActionOnCopyByDefault);
this->AddEmbeddedObjects(target, "Embed Resources", "XCODE_EMBED_RESOURCES",
dstSubfolderSpec, NoActionOnCopyByDefault);
}
bool cmGlobalXCodeGenerator::CreateGroups(

View File

@@ -8,7 +8,7 @@ if (NOT (IS_DIRECTORY ${EMBED_RESOURCES_FOLDER}))
endif()
set_target_properties(app PROPERTIES
XCODE_EMBED_RESOURCES_PATH ${EMBED_RESOURCES_FOLDER}
XCODE_EMBED_RESOURCES ${EMBED_RESOURCES_FOLDER}
)
set_target_properties(app PROPERTIES