From 1f9bdcadc2196c200411c04b40c4d00a663ce300 Mon Sep 17 00:00:00 2001
From: Evan Wilde <ewilde@apple.com>
Date: Tue, 9 Dec 2025 13:34:29 -0800
Subject: [PATCH 1/2] CMake: StringProcessing: Catalyst support

Enable catalyst support in Apple StringProcessing builds
---
 Runtimes/Supplemental/StringProcessing/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Runtimes/Supplemental/StringProcessing/CMakeLists.txt b/Runtimes/Supplemental/StringProcessing/CMakeLists.txt
index 67d89a42d9e..099c0a405e0 100644
--- a/Runtimes/Supplemental/StringProcessing/CMakeLists.txt
+++ b/Runtimes/Supplemental/StringProcessing/CMakeLists.txt
@@ -42,6 +42,7 @@ include(EmitSwiftInterface)
 include(InstallSwiftInterface)
 include(PlatformInfo)
 include(ResourceEmbedding)
+include(CatalystSupport)
 
 option(${PROJECT_NAME}_INSTALL_NESTED_SUBDIR "Install libraries under a platform and architecture subdirectory" ON)
 set(${PROJECT_NAME}_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}/swift$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:_static>$<$<BOOL:${PROJECT_NAME}_INSTALL_NESTED_SUBDIR>:/${${PROJECT_NAME}_PLATFORM_SUBDIR}/${${PROJECT_NAME}_ARCH_SUBDIR}>")

From b2797334eb910738adec23a1c6bf7c6e3ccd3ba9 Mon Sep 17 00:00:00 2001
From: Evan Wilde <ewilde@apple.com>
Date: Tue, 9 Dec 2025 13:38:47 -0800
Subject: [PATCH 2/2] CMake: StringProcessing: Embed Plist Sections

Generate and embed plists for StringProcessing libraries.

rdar://165944416
---
 .../Supplemental/StringProcessing/RegexBuilder/CMakeLists.txt    | 1 +
 .../Supplemental/StringProcessing/_RegexParser/CMakeLists.txt    | 1 +
 .../StringProcessing/_StringProcessing/CMakeLists.txt            | 1 +
 3 files changed, 3 insertions(+)

diff --git a/Runtimes/Supplemental/StringProcessing/RegexBuilder/CMakeLists.txt b/Runtimes/Supplemental/StringProcessing/RegexBuilder/CMakeLists.txt
index 80d8923907c..a5a4087ca8a 100644
--- a/Runtimes/Supplemental/StringProcessing/RegexBuilder/CMakeLists.txt
+++ b/Runtimes/Supplemental/StringProcessing/RegexBuilder/CMakeLists.txt
@@ -22,4 +22,5 @@ install(TARGETS swiftRegexBuilder
 emit_swift_interface(swiftRegexBuilder)
 install_swift_interface(swiftRegexBuilder)
 
+generate_plist(swiftRegexBuilder "${CMAKE_PROJECT_VERSION}" swiftRegexBuilder)
 embed_manifest(swiftRegexBuilder)
diff --git a/Runtimes/Supplemental/StringProcessing/_RegexParser/CMakeLists.txt b/Runtimes/Supplemental/StringProcessing/_RegexParser/CMakeLists.txt
index e431544c460..a3bad78505f 100644
--- a/Runtimes/Supplemental/StringProcessing/_RegexParser/CMakeLists.txt
+++ b/Runtimes/Supplemental/StringProcessing/_RegexParser/CMakeLists.txt
@@ -45,4 +45,5 @@ install(TARGETS swift_RegexParser
 emit_swift_interface(swift_RegexParser)
 install_swift_interface(swift_RegexParser)
 
+generate_plist(swiftRegexParser "${CMAKE_PROJECT_VERSION}" swift_RegexParser)
 embed_manifest(swift_RegexParser)
diff --git a/Runtimes/Supplemental/StringProcessing/_StringProcessing/CMakeLists.txt b/Runtimes/Supplemental/StringProcessing/_StringProcessing/CMakeLists.txt
index d2a4e67bb27..e83958be998 100644
--- a/Runtimes/Supplemental/StringProcessing/_StringProcessing/CMakeLists.txt
+++ b/Runtimes/Supplemental/StringProcessing/_StringProcessing/CMakeLists.txt
@@ -87,4 +87,5 @@ install(TARGETS swift_StringProcessing
 emit_swift_interface(swift_StringProcessing)
 install_swift_interface(swift_StringProcessing)
 
+generate_plist(swiftStringProcessing "${CMAKE_PROJECT_VERSION}" swift_StringProcessing)
 embed_manifest(swift_StringProcessing)