From fc1a85da79ab94140b41265ea8516048e0a3a87b Mon Sep 17 00:00:00 2001 From: Jeff Becker Date: Mon, 9 Nov 2020 08:32:10 -0500 Subject: [PATCH] build lokimq from pkg-config --- CMakeLists.txt | 4 +++- contrib/loki-auth-server.service | 13 +++++++++++++ lokinet/__init__.py | 0 examples/exit_auth.py => lokinet/auth/__main__.py | 0 pylokimq/CMakeLists.txt | 2 +- 5 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 contrib/loki-auth-server.service create mode 100644 lokinet/__init__.py rename examples/exit_auth.py => lokinet/auth/__main__.py (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1bd0cc3..3fb573a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,6 +48,8 @@ endif() add_compile_options(-Wno-deprecated-declarations) add_subdirectory(external/pybind11) -add_subdirectory(external/loki-mq) + +include(FindPkgConfig) +pkg_check_modules(lokimq REQUIRED IMPORTED_TARGET GLOBAL liblokimq) add_subdirectory(pylokimq) diff --git a/contrib/loki-auth-server.service b/contrib/loki-auth-server.service new file mode 100644 index 0000000..a28ee2f --- /dev/null +++ b/contrib/loki-auth-server.service @@ -0,0 +1,13 @@ +[Unit] +Description=Lokinet Auth Server +Wants=network-online.target +After=network-online.target + + +[Service] +User=nobody +SyslogIdentifier=lokinet-auth +ExecStart=/usr/bin/python3 -m lokinet.auth --bind tcp://0.0.0.0:5555/ --cmd /usr/local/exit-provider/check.sh + +[Install] +WantedBy=multi-user.target \ No newline at end of file diff --git a/lokinet/__init__.py b/lokinet/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/examples/exit_auth.py b/lokinet/auth/__main__.py similarity index 100% rename from examples/exit_auth.py rename to lokinet/auth/__main__.py diff --git a/pylokimq/CMakeLists.txt b/pylokimq/CMakeLists.txt index 849bdc3..d5f39d0 100644 --- a/pylokimq/CMakeLists.txt +++ b/pylokimq/CMakeLists.txt @@ -5,6 +5,6 @@ pybind11_add_module(pylokimq MODULE module.cpp ) -target_link_libraries(pylokimq PUBLIC lokimq::lokimq) +target_link_libraries(pylokimq PUBLIC PkgConfig::lokimq)