@@ -136,15 +136,15 @@ if libraryEvolutionCondition {
136
136
137
137
let openGraphTarget = Target . target (
138
138
name: " OpenGraph " ,
139
- dependencies: [ " OpenGraph_SPI " ] ,
139
+ dependencies: [ " OpenGraphCxx " ] ,
140
140
cSettings: sharedCSettings,
141
141
swiftSettings: sharedSwiftSettings
142
142
)
143
143
// FIXME: Merge into one target
144
144
// OpenGraph is a C++ & Swift mix target.
145
145
// The SwiftPM support for such usage is still in progress.
146
146
let openGraphSPITarget = Target . target (
147
- name: " OpenGraph_SPI " ,
147
+ name: " OpenGraphCxx " ,
148
148
cSettings: sharedCSettings + [
149
149
. define( " __COREFOUNDATION_FORSWIFTFOUNDATIONONLY__ " , to: " 1 " , . when( platforms: . nonDarwinPlatforms) ) ,
150
150
] ,
@@ -170,14 +170,11 @@ let openGraphTestTarget = Target.testTarget(
170
170
swiftSettings: sharedSwiftSettings
171
171
)
172
172
let openGraphSPITestTarget = Target . testTarget (
173
- name: " OpenGraph_SPITests " ,
173
+ name: " OpenGraphCxxTests " ,
174
174
dependencies: [
175
- " OpenGraph_SPI " ,
175
+ " OpenGraphCxx " ,
176
176
] ,
177
177
exclude: [ " README.md " ] ,
178
- cSettings: sharedCSettings + [
179
- . headerSearchPath( " ../../Sources/OpenGraph_SPI " ) ,
180
- ] ,
181
178
swiftSettings: sharedSwiftSettings + [ . interoperabilityMode( . Cxx) ]
182
179
)
183
180
let openGraphShimsTestTarget = Target . testTarget (
@@ -204,8 +201,8 @@ let openGraphCompatibilityTestTarget = Target.testTarget(
204
201
let package = Package (
205
202
name: " OpenGraph " ,
206
203
products: [
207
- . library( name: " OpenGraph " , type: . dynamic, targets: [ " OpenGraph " , " OpenGraph_SPI " ] ) ,
208
- . library( name: " OpenGraphShims " , type: . dynamic, targets: [ " OpenGraph " , " OpenGraph_SPI " , " OpenGraphShims " ] ) ,
204
+ . library( name: " OpenGraph " , type: . dynamic, targets: [ " OpenGraph " , " OpenGraphCxx " ] ) ,
205
+ . library( name: " OpenGraphShims " , type: . dynamic, targets: [ " OpenGraph " , " OpenGraphCxx " , " OpenGraphShims " ] ) ,
209
206
] ,
210
207
dependencies: [
211
208
. package ( url: " https://github.com/apple/swift-numerics " , from: " 1.0.2 " ) ,
0 commit comments