Skip to content

Commit ff3fdd3

Browse files
[cmake] Use correct identifier for CFBundleIdentifier (#83960)
Use the associated library name for the `CFBundleIdentifier` within the plist. This will prevent cases where we have projects with multiple targets referencing the project name itself (i.e swiftSwiftOnoneSupport had it's bundle name set to SwiftCore)
1 parent c38db43 commit ff3fdd3

File tree

8 files changed

+8
-8
lines changed

8 files changed

+8
-8
lines changed

Runtimes/Core/Concurrency/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,5 +158,5 @@ emit_swift_interface(swift_Concurrency)
158158
install_swift_interface(swift_Concurrency)
159159

160160
# Configure plist creation for Darwin platforms.
161-
generate_plist("${CMAKE_PROJECT_NAME}" "${CMAKE_PROJECT_VERSION}" swift_Concurrency)
161+
generate_plist(swift_Concurrency "${CMAKE_PROJECT_VERSION}" swift_Concurrency)
162162
embed_manifest(swift_Concurrency)

Runtimes/Core/SwiftOnoneSupport/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,5 @@ emit_swift_interface(swiftSwiftOnoneSupport)
4141
install_swift_interface(swiftSwiftOnoneSupport)
4242

4343
# Configure plist creation for Darwin platforms.
44-
generate_plist("${CMAKE_PROJECT_NAME}" "${CMAKE_PROJECT_VERSION}" swiftSwiftOnoneSupport)
44+
generate_plist(swiftSwiftOnoneSupport "${CMAKE_PROJECT_VERSION}" swiftSwiftOnoneSupport)
4545
embed_manifest(swiftSwiftOnoneSupport)

Runtimes/Core/core/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ emit_swift_interface(swiftCore)
385385
install_swift_interface(swiftCore)
386386

387387
# Configure plist creation for Darwin platforms.
388-
generate_plist("${CMAKE_PROJECT_NAME}" "${CMAKE_PROJECT_VERSION}" swiftCore)
388+
generate_plist(swiftCore "${CMAKE_PROJECT_VERSION}" swiftCore)
389389
embed_manifest(swiftCore)
390390

391391
include("${SwiftCore_VENDOR_MODULE_DIR}/swiftCore.cmake" OPTIONAL)

Runtimes/Supplemental/Differentiation/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ emit_swift_interface(swift_Differentiation)
132132
install_swift_interface(swift_Differentiation)
133133

134134
# Configure plist creation for Darwin platforms.
135-
generate_plist("${CMAKE_PROJECT_NAME}" "${CMAKE_PROJECT_VERSION}" swift_Differentiation)
135+
generate_plist(swift_Differentiation "${CMAKE_PROJECT_VERSION}" swift_Differentiation)
136136
embed_manifest(swift_Differentiation)
137137

138138
include("${${PROJECT_NAME}_VENDOR_MODULE_DIR}/swift_Differentiation.cmake" OPTIONAL)

Runtimes/Supplemental/Distributed/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ emit_swift_interface(swiftDistributed)
155155
install_swift_interface(swiftDistributed)
156156

157157
# Configure plist creation for Darwin platforms.
158-
generate_plist("${CMAKE_PROJECT_NAME}" "${CMAKE_PROJECT_VERSION}" swiftDistributed)
158+
generate_plist(swiftDistributed "${CMAKE_PROJECT_VERSION}" swiftDistributed)
159159
embed_manifest(swiftDistributed)
160160

161161
include("${${PROJECT_NAME}_VENDOR_MODULE_DIR}/swiftDistributed.cmake" OPTIONAL)

Runtimes/Supplemental/Observation/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ emit_swift_interface(swiftObservation)
119119
install_swift_interface(swiftObservation)
120120

121121
# Configure plist creation for Darwin platforms.
122-
generate_plist("${CMAKE_PROJECT_NAME}" "${CMAKE_PROJECT_VERSION}" swiftObservation)
122+
generate_plist(swiftObservation "${CMAKE_PROJECT_VERSION}" swiftObservation)
123123
embed_manifest(swiftObservation)
124124

125125
include("${${PROJECT_NAME}_VENDOR_MODULE_DIR}/swiftObservation.cmake" OPTIONAL)

Runtimes/Supplemental/Synchronization/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ emit_swift_interface(swiftSynchronization)
190190
install_swift_interface(swiftSynchronization)
191191

192192
# Configure plist creation for Darwin platforms.
193-
generate_plist("${CMAKE_PROJECT_NAME}" "${CMAKE_PROJECT_VERSION}" swiftSynchronization)
193+
generate_plist(swiftSynchronization "${CMAKE_PROJECT_VERSION}" swiftSynchronization)
194194
embed_manifest(swiftSynchronization)
195195

196196
include("${${PROJECT_NAME}_VENDOR_MODULE_DIR}/swiftSynchronization.cmake" OPTIONAL)

Runtimes/Supplemental/Volatile/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ emit_swift_interface(swift_Volatile)
9797
install_swift_interface(swift_Volatile)
9898

9999
# Configure plist creation for Darwin platforms.
100-
generate_plist("${CMAKE_PROJECT_NAME}" "${CMAKE_PROJECT_VERSION}" swift_Volatile)
100+
generate_plist(swift_Volatile "${CMAKE_PROJECT_VERSION}" swift_Volatile)
101101
embed_manifest(swift_Volatile)
102102

103103
include("${${PROJECT_NAME}_VENDOR_MODULE_DIR}/swift_Volatile.cmake" OPTIONAL)

0 commit comments

Comments
 (0)