WireGuardKit: Set publicHeadersPath = "." to flatten public headers structure

Signed-off-by: Andrej Mihajlov <and@mullvad.net>

diff --git a/Package.swift b/Package.swift
index 7b04c878f715714487b31447a72ef5571435e660..b414377cccca1078dd798d65eb71ef036a3a0c88 100644 (file)
--- a/Package.swift
+++ b/Package.swift
@@ -20,11 +20,13 @@ let package = Package(
         ),
         .target(
             name: "WireGuardKitC",
-            dependencies: []
+            dependencies: [],
+            publicHeadersPath: "."
         ),
         .target(
             name: "WireGuardKitGo",
             dependencies: [],
+            publicHeadersPath: ".",
             linkerSettings: [.linkedLibrary("wg-go")]
         )
     ]

diff --git a/Sources/WireGuardKitC/include/WireGuardKitCTarget.h b/Sources/WireGuardKitC/WireGuardKitC.h
similarity index 68%
rename from Sources/WireGuardKitC/include/WireGuardKitCTarget.h
rename to Sources/WireGuardKitC/WireGuardKitC.h
index 30a24e4a03a1b5750498b2bff6f1ce44a279d9b9..83ff67d6c1ef3f6ba4fdce63e1e8384730b53f9c 100644 (file)
--- a/Sources/WireGuardKitC/include/WireGuardKitCTarget.h
+++ b/Sources/WireGuardKitC/WireGuardKitC.h
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
 // Copyright © 2018-2019 WireGuard LLC. All Rights Reserved.
 
-#include "../key.h"
-#include "../x25519.h"
+#include "key.h"
+#include "x25519.h"

diff --git a/Sources/WireGuardKitC/module.modulemap b/Sources/WireGuardKitC/module.modulemap
index 606e4707eb2d46df9a51f533ecf42561e408a1e7..26b45bf35c5f4b424e962a2fc447efd00024a1fd 100644 (file)
--- a/Sources/WireGuardKitC/module.modulemap
+++ b/Sources/WireGuardKitC/module.modulemap
@@ -1,4 +1,4 @@
 module WireGuardKitC {
-    umbrella header "include/WireGuardKitCTarget.h"
+    umbrella header "WireGuardKitC.h"
     export *
 }