From 0738695eb9a5160cd1ae99ed13908da924280f15 Mon Sep 17 00:00:00 2001 From: Jason Rhinelander Date: Thu, 14 Jan 2021 14:38:14 -0400 Subject: [PATCH] Add lokimq compatibility headers --- CMakeLists.txt | 35 +++++++++++++++++++++++++++++++++++ liblokimq.pc.in | 13 +++++++++++++ lokimq/address.h | 4 ++++ lokimq/auth.h | 4 ++++ lokimq/base32z.h | 4 ++++ lokimq/base64.h | 4 ++++ lokimq/batch.h | 4 ++++ lokimq/bt_serialize.h | 4 ++++ lokimq/bt_value.h | 4 ++++ lokimq/connections.h | 4 ++++ lokimq/hex.h | 4 ++++ lokimq/lokimq.h | 10 ++++++++++ lokimq/message.h | 4 ++++ lokimq/variant.h | 2 ++ lokimq/version.h | 4 ++++ 15 files changed, 104 insertions(+) create mode 100644 liblokimq.pc.in create mode 100644 lokimq/address.h create mode 100644 lokimq/auth.h create mode 100644 lokimq/base32z.h create mode 100644 lokimq/base64.h create mode 100644 lokimq/batch.h create mode 100644 lokimq/bt_serialize.h create mode 100644 lokimq/bt_value.h create mode 100644 lokimq/connections.h create mode 100644 lokimq/hex.h create mode 100644 lokimq/lokimq.h create mode 100644 lokimq/message.h create mode 100644 lokimq/variant.h create mode 100644 lokimq/version.h diff --git a/CMakeLists.txt b/CMakeLists.txt index ffd627c..d74da72 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,11 +31,16 @@ endif() option(OXENMQ_BUILD_TESTS "Building and perform oxenmq tests" ${oxenmq_IS_TOPLEVEL_PROJECT}) option(OXENMQ_INSTALL "Add oxenmq libraries and headers to cmake install target; defaults to ON if BUILD_SHARED_LIBS is enabled or we are the top-level project; OFF for a static subdirectory build" ${oxenmq_INSTALL_DEFAULT}) option(OXENMQ_INSTALL_CPPZMQ "Install cppzmq header with oxenmq/ headers (requires OXENMQ_INSTALL)" ON) +option(OXENMQ_LOKIMQ_COMPAT "Install lokimq compatibility headers and pkg-config for rename migration" ON) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") configure_file(oxenmq/version.h.in oxenmq/version.h @ONLY) configure_file(liboxenmq.pc.in liboxenmq.pc @ONLY) +if(OXENMQ_LOKIMQ_COMPAT) + configure_file(liblokimq.pc.in liblokimq.pc @ONLY) +endif() + add_library(oxenmq oxenmq/address.cpp @@ -141,6 +146,9 @@ else() endif() add_library(oxenmq::oxenmq ALIAS oxenmq) +if(OXENMQ_LOKIMQ_COMPAT) + add_library(lokimq::lokimq ALIAS oxenmq) +endif() export( TARGETS oxenmq @@ -185,6 +193,33 @@ if(OXENMQ_INSTALL) FILES ${CMAKE_CURRENT_BINARY_DIR}/liboxenmq.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) + + if(OXENMQ_LOKIMQ_COMPAT) + install( + FILES lokimq/address.h + lokimq/auth.h + lokimq/base32z.h + lokimq/base64.h + lokimq/batch.h + lokimq/bt_serialize.h + lokimq/bt_value.h + lokimq/connections.h + lokimq/hex.h + lokimq/lokimq.h + lokimq/message.h + lokimq/string_view.h + lokimq/variant.h + lokimq/version.h + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/lokimq + ) + + install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/liblokimq.pc + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig + ) + endif() + + endif() if(OXENMQ_BUILD_TESTS) diff --git a/liblokimq.pc.in b/liblokimq.pc.in new file mode 100644 index 0000000..3c707a6 --- /dev/null +++ b/liblokimq.pc.in @@ -0,0 +1,13 @@ +prefix=@CMAKE_INSTALL_PREFIX@ +exec_prefix=${prefix} +libdir=@CMAKE_INSTALL_FULL_LIBDIR@ +includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + +Name: liblokimq +Description: ZeroMQ-based communication library (compatibility package for liboxenmq) +Version: @OXENMQ_VERSION@ + +Libs: -L${libdir} -loxenmq +Libs.private: @PRIVATE_LIBS@ +Requires.private: libzmq libsodium +Cflags: -I${includedir} diff --git a/lokimq/address.h b/lokimq/address.h new file mode 100644 index 0000000..5239b39 --- /dev/null +++ b/lokimq/address.h @@ -0,0 +1,4 @@ +#pragma once +#include "../oxenmq/address.h" + +namespace lokimq = oxenmq; diff --git a/lokimq/auth.h b/lokimq/auth.h new file mode 100644 index 0000000..d6c38f6 --- /dev/null +++ b/lokimq/auth.h @@ -0,0 +1,4 @@ +#pragma once +#include "../oxenmq/auth.h" + +namespace lokimq = oxenmq; diff --git a/lokimq/base32z.h b/lokimq/base32z.h new file mode 100644 index 0000000..0f40acf --- /dev/null +++ b/lokimq/base32z.h @@ -0,0 +1,4 @@ +#pragma once +#include "../oxenmq/base32z.h" + +namespace lokimq = oxenmq; diff --git a/lokimq/base64.h b/lokimq/base64.h new file mode 100644 index 0000000..36f2c7d --- /dev/null +++ b/lokimq/base64.h @@ -0,0 +1,4 @@ +#pragma once +#include "../oxenmq/base64.h" + +namespace lokimq = oxenmq; diff --git a/lokimq/batch.h b/lokimq/batch.h new file mode 100644 index 0000000..bf06f14 --- /dev/null +++ b/lokimq/batch.h @@ -0,0 +1,4 @@ +#pragma once +#include "../oxenmq/batch.h" + +namespace lokimq = oxenmq; diff --git a/lokimq/bt_serialize.h b/lokimq/bt_serialize.h new file mode 100644 index 0000000..1d904a6 --- /dev/null +++ b/lokimq/bt_serialize.h @@ -0,0 +1,4 @@ +#pragma once +#include "../oxenmq/bt_serialize.h" + +namespace lokimq = oxenmq; diff --git a/lokimq/bt_value.h b/lokimq/bt_value.h new file mode 100644 index 0000000..c311b76 --- /dev/null +++ b/lokimq/bt_value.h @@ -0,0 +1,4 @@ +#pragma once +#include "../oxenmq/bt_value.h" + +namespace lokimq = oxenmq; diff --git a/lokimq/connections.h b/lokimq/connections.h new file mode 100644 index 0000000..5775338 --- /dev/null +++ b/lokimq/connections.h @@ -0,0 +1,4 @@ +#pragma once +#include "../oxenmq/connections.h" + +namespace lokimq = oxenmq; diff --git a/lokimq/hex.h b/lokimq/hex.h new file mode 100644 index 0000000..08c3b58 --- /dev/null +++ b/lokimq/hex.h @@ -0,0 +1,4 @@ +#pragma once +#include "../oxenmq/hex.h" + +namespace lokimq = oxenmq; diff --git a/lokimq/lokimq.h b/lokimq/lokimq.h new file mode 100644 index 0000000..57ed082 --- /dev/null +++ b/lokimq/lokimq.h @@ -0,0 +1,10 @@ +#pragma once +#include "../oxenmq/oxenmq.h" + +namespace lokimq = oxenmq; + +namespace oxenmq { + +using LokiMQ = OxenMQ; + +} diff --git a/lokimq/message.h b/lokimq/message.h new file mode 100644 index 0000000..a0e8ad5 --- /dev/null +++ b/lokimq/message.h @@ -0,0 +1,4 @@ +#pragma once +#include "../oxenmq/message.h" + +namespace lokimq = oxenmq; diff --git a/lokimq/variant.h b/lokimq/variant.h new file mode 100644 index 0000000..08cb791 --- /dev/null +++ b/lokimq/variant.h @@ -0,0 +1,2 @@ +#pragma once +#include "../oxenmq/variant.h" diff --git a/lokimq/version.h b/lokimq/version.h new file mode 100644 index 0000000..d49e184 --- /dev/null +++ b/lokimq/version.h @@ -0,0 +1,4 @@ +#pragma once +#include "../oxenmq/version.h" + +namespace lokimq = oxenmq;