소스 검색

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`.
halx99 1 년 전
부모
커밋
6030df205a
3개의 변경된 파일4개의 추가작업 그리고 5개의 파일을 삭제
  1. 1 1
      Help/prop_tgt/XCODE_EMBED_type.rst
  2. 2 3
      Source/cmGlobalXCodeGenerator.cxx
  3. 1 1
      Tests/RunCMake/XcodeProject-Embed/EmbedResources.cmake

+ 1 - 1
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

+ 2 - 3
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(

+ 1 - 1
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