From 5ac96bed4da760e095e5ca588512d0b9ff1b6e70 Mon Sep 17 00:00:00 2001 From: Thiago Holanda Date: Fri, 22 May 2020 23:41:32 +0200 Subject: [PATCH] Remove CZeroMQ as dependency and embed as system library --- Package.swift | 25 ++++++++++++++++++++----- Sources/CZeroMQ/module.modulemap | 5 +++++ Sources/CZeroMQ/zmqinclude.h | 1 + 3 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 Sources/CZeroMQ/module.modulemap create mode 100644 Sources/CZeroMQ/zmqinclude.h diff --git a/Package.swift b/Package.swift index 36a9660..c7bb9c5 100644 --- a/Package.swift +++ b/Package.swift @@ -7,14 +7,29 @@ let package = Package( products: [ .library( name: "ZeroMQKit", - targets: ["ZeroMQKit"] + targets: [ + "ZeroMQKit" + ] ) ], - dependencies: [ - .package(url: "https://github.com/evolution-app/CZeroMQ.git", from: "1.0.4") - ], targets: [ - .target(name: "ZeroMQKit"), + .target( + name: "ZeroMQKit", + dependencies: ["CZeroMQ"] + ), + .systemLibrary( + name: "CZeroMQ", + path: "Sources/CZeroMQ", + pkgConfig: "libzmq", + providers: [ + .brew([ + "zmq" + ]), + .apt([ + "libzmq3-dev" + ]) + ] + ), .testTarget( name: "MainTests", dependencies: ["ZeroMQKit"] diff --git a/Sources/CZeroMQ/module.modulemap b/Sources/CZeroMQ/module.modulemap new file mode 100644 index 0000000..c6aa44b --- /dev/null +++ b/Sources/CZeroMQ/module.modulemap @@ -0,0 +1,5 @@ +module CZeroMQ [system] { + header "./zmqinclude.h" + link "zmq" + export * +} \ No newline at end of file diff --git a/Sources/CZeroMQ/zmqinclude.h b/Sources/CZeroMQ/zmqinclude.h new file mode 100644 index 0000000..5de1f07 --- /dev/null +++ b/Sources/CZeroMQ/zmqinclude.h @@ -0,0 +1 @@ +#import