Skip to content

Commit 5fb8fa1

Browse files
committed
Reorganized the include folder to expose symbols to the dependency above. Using imports in the unit tests.
1 parent 7abff80 commit 5fb8fa1

18 files changed

+11
-27
lines changed

Package.swift

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ import PackageDescription
44
/// Cocoapods to SPM Conversion Notes
55
/// * Using name: `proj-ios` causes issues with resource loading in Objective-C with [SWIFTPM_MODULE_BUNDLE pathForResource:resource ofType:type]; (The `-` become `_`)
66
/// * Moved `proj.db` into this package since it gets loaded here for actual usage, not in PROJ (Access to resources is limited in SPM vs cocoapods)
7+
/// * Reorganized headers into include folder and resources into Resources
78

89
let package = Package(
9-
name: "projections", // "proj-ios", // Hyphen may cause resource loading failures from SPM package
10+
name: "projections",
1011
platforms: [
1112
.iOS(.v13), .macOS(.v13)
1213
],
@@ -35,21 +36,15 @@ let package = Package(
3536
.product(name: "crs-ios", package: "coordinate-reference-systems-ios"),
3637
],
3738
path: "proj-ios",
38-
3939
exclude: [
4040
],
4141
resources: [
42-
.copy("Resources/proj.db"), // 9.4.0 proj.db
42+
.copy("Resources/proj.db"),
4343
.copy("Resources/projections.ogc.plist"),
4444
.copy("Resources/projections.none.plist"),
4545
.copy("Resources/projections.epsg.plist")
4646
],
47-
publicHeadersPath: ".",
48-
cSettings: [
49-
.headerSearchPath("../include/proj"),
50-
],
51-
linkerSettings: [
52-
]
47+
publicHeadersPath: "include/Projections"
5348
),
5449
.testTarget(
5550
name: "proj-iosTests",
@@ -62,6 +57,9 @@ let package = Package(
6257
],
6358
sources: ["."],
6459
resources: [
60+
],
61+
cSettings: [
62+
// .headerSearchPath("../include/proj"),
6563
]
6664
),
6765
.testTarget(
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)