From: Andrej Mihajlov <and@mullvad.net>
Date: Wed, 2 Dec 2020 12:02:36 +0000 (+0100)
Subject: WireGuardKit: Set publicHeadersPath = "." to flatten public headers structure
X-Git-Tag: 1.0.10-18~43
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fd527f73e6d4b6968a793b1853318cb30eb2a7e3;p=thirdparty%2Fwireguard-apple.git

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 7b04c87..b414377 100644
--- 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 30a24e4..83ff67d 100644
--- 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 606e470..26b45bf 100644
--- 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 *
 }