Better Package.swift and modulemap

Updated includes to the new libevhtp version
crossroadlabs · Feb 28, 2017 · 4198cb1 · 4198cb1
1 parent 4852dd6
commit 4198cb1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/Package.swift b/Package.swift
@@ -1,5 +1,10 @@
 import PackageDescription
 
 let package = Package(
-    name: "CEHVTP"
+    name: "CEHVTP",
+    pkgConfig: "evhtp",
+    providers: [
+        .Apt("libevhtp-dev"),
+        .Brew("libevhtp")
+    ]
 )
diff --git a/cevhtp.h b/cevhtp.h
@@ -19,6 +19,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <evhtp.h>
-#include <htparse.h>
+#include <evhtp/evhtp.h>
+#include <evhtp/htparse.h>
 #include <event2/thread.h>
diff --git a/module.modulemap b/module.modulemap
@@ -20,7 +20,7 @@
 //===----------------------------------------------------------------------===//
 
 module CEVHTP [system] {
-	header "cevhtp.h"
+	umbrella header "cevhtp.h"
 	link "evhtp"
 	link "ssl"
 	link "crypto"