Merge topic 'xcode-embed-resources' into release-3.28

6030df205a Xcode: Fix embed resources prop name

Acked-by: Kitware Robot <[email protected]>
Acked-by: Deal <[email protected]>
Merge-request: !9008

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

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(

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