diff options
| author | halx99 <halx99@live.com> | 2023-11-28 15:53:23 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-11-28 17:06:29 (GMT) |
| commit | 6030df205a72c33f3497deb11a6a2b0bcfa3cfbb (patch) | |
| tree | 7db7ac18e8aa5a3d60441a93e98de1a61b194349 | |
| parent | 01deb5809854b1ce1fdaa8fd8e31adf31a134904 (diff) | |
| download | CMake-6030df205a72c33f3497deb11a6a2b0bcfa3cfbb.zip CMake-6030df205a72c33f3497deb11a6a2b0bcfa3cfbb.tar.gz CMake-6030df205a72c33f3497deb11a6a2b0bcfa3cfbb.tar.bz2 | |
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`.
| -rw-r--r-- | Help/prop_tgt/XCODE_EMBED_type.rst | 2 | ||||
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 5 | ||||
| -rw-r--r-- | Tests/RunCMake/XcodeProject-Embed/EmbedResources.cmake | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/Help/prop_tgt/XCODE_EMBED_type.rst b/Help/prop_tgt/XCODE_EMBED_type.rst index 76b0e3d..e27d905 100644 --- a/Help/prop_tgt/XCODE_EMBED_type.rst +++ b/Help/prop_tgt/XCODE_EMBED_type.rst @@ -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 diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index cce45a3..ec2550a 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -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( diff --git a/Tests/RunCMake/XcodeProject-Embed/EmbedResources.cmake b/Tests/RunCMake/XcodeProject-Embed/EmbedResources.cmake index 0638037..6994c99 100644 --- a/Tests/RunCMake/XcodeProject-Embed/EmbedResources.cmake +++ b/Tests/RunCMake/XcodeProject-Embed/EmbedResources.cmake @@ -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 |