Merge pull request #1555 from majestrate/lokimq-oxenmq-rename-2021-03-01

loki-mq -> oxen-mq

.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

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()
 

external/loki-mq

@@ -1 +0,0 @@
-Subproject commit 506bd65b05b1cd5b11b4d1e3392306e4473f5ba3

external/oxen-mq

@@ -0,0 +1 @@
+Subproject commit f9ef827075cd4913ec077cb748d5db17d899152f