diff --git a/.gitmodules b/.gitmodules index a3d2783fe..3168c4763 100644 --- a/.gitmodules +++ b/.gitmodules @@ -23,10 +23,9 @@ [submodule "external/clang-format-hooks"] path = external/clang-format-hooks url = https://github.com/barisione/clang-format-hooks/ -[submodule "external/loki-mq"] - path = external/loki-mq - url = https://github.com/loki-project/loki-mq - branch = dev [submodule "external/sqlite_orm"] path = external/sqlite_orm url = https://github.com/fnc12/sqlite_orm +[submodule "external/oxen-mq"] + path = external/oxen-mq + url = https://github.com/oxen-io/oxen-mq diff --git a/CMakeLists.txt b/CMakeLists.txt index 727c48525..8ee577448 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -160,19 +160,19 @@ if(NOT TARGET sodium) export(TARGETS sodium NAMESPACE sodium:: FILE sodium-exports.cmake) endif() -option(FORCE_LOKIMQ_SUBMODULE "force using lokimq submodule" OFF) -if(NOT FORCE_LOKIMQ_SUBMODULE) - pkg_check_modules(LOKIMQ liboxenmq>=1.2.2) +option(FORCE_OXENMQ_SUBMODULE "force using oxenmq submodule" OFF) +if(NOT FORCE_OXENMQ_SUBMODULE) + pkg_check_modules(OXENMQ liboxenmq>=1.2.2) endif() -if(LOKIMQ_FOUND) +if(OXENMQ_FOUND) add_library(oxenmq INTERFACE) - link_dep_libs(oxenmq INTERFACE "${LOKIMQ_LIBRARY_DIRS}" ${LOKIMQ_LIBRARIES}) - target_include_directories(oxenmq INTERFACE ${LOKIMQ_INCLUDE_DIRS}) + link_dep_libs(oxenmq INTERFACE "${OXENMQ_LIBRARY_DIRS}" ${OXENMQ_LIBRARIES}) + target_include_directories(oxenmq INTERFACE ${OXENMQ_INCLUDE_DIRS}) add_library(oxenmq::oxenmq ALIAS oxenmq) - message(STATUS "Found system liboxenmq ${LOKIMQ_VERSION}") + message(STATUS "Found system liboxenmq ${OXENMQ_VERSION}") else() message(STATUS "using oxenmq submodule") - add_subdirectory(${CMAKE_SOURCE_DIR}/external/loki-mq) + add_subdirectory(${CMAKE_SOURCE_DIR}/external/oxen-mq) endif() @@ -315,7 +315,7 @@ if(SUBMODULE_CHECK) check_submodule(external/date) check_submodule(external/pybind11) check_submodule(external/sqlite_orm) - check_submodule(external/loki-mq) + check_submodule(external/oxen-mq) endif() endif() diff --git a/external/loki-mq b/external/loki-mq deleted file mode 160000 index 506bd65b0..000000000 --- a/external/loki-mq +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 506bd65b05b1cd5b11b4d1e3392306e4473f5ba3 diff --git a/external/oxen-mq b/external/oxen-mq new file mode 160000 index 000000000..f9ef82707 --- /dev/null +++ b/external/oxen-mq @@ -0,0 +1 @@ +Subproject commit f9ef827075cd4913ec077cb748d5db17d899152f