mirror of
https://github.com/oxen-io/lokinet
synced 2023-12-14 06:53:00 +01:00
Merge pull request #1555 from majestrate/lokimq-oxenmq-rename-2021-03-01
loki-mq -> oxen-mq
This commit is contained in:
commit
f2f0486f13
7
.gitmodules
vendored
7
.gitmodules
vendored
|
@ -23,10 +23,9 @@
|
||||||
[submodule "external/clang-format-hooks"]
|
[submodule "external/clang-format-hooks"]
|
||||||
path = external/clang-format-hooks
|
path = external/clang-format-hooks
|
||||||
url = https://github.com/barisione/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"]
|
[submodule "external/sqlite_orm"]
|
||||||
path = external/sqlite_orm
|
path = external/sqlite_orm
|
||||||
url = https://github.com/fnc12/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
|
||||||
|
|
|
@ -160,19 +160,19 @@ if(NOT TARGET sodium)
|
||||||
export(TARGETS sodium NAMESPACE sodium:: FILE sodium-exports.cmake)
|
export(TARGETS sodium NAMESPACE sodium:: FILE sodium-exports.cmake)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
option(FORCE_LOKIMQ_SUBMODULE "force using lokimq submodule" OFF)
|
option(FORCE_OXENMQ_SUBMODULE "force using oxenmq submodule" OFF)
|
||||||
if(NOT FORCE_LOKIMQ_SUBMODULE)
|
if(NOT FORCE_OXENMQ_SUBMODULE)
|
||||||
pkg_check_modules(LOKIMQ liboxenmq>=1.2.2)
|
pkg_check_modules(OXENMQ liboxenmq>=1.2.2)
|
||||||
endif()
|
endif()
|
||||||
if(LOKIMQ_FOUND)
|
if(OXENMQ_FOUND)
|
||||||
add_library(oxenmq INTERFACE)
|
add_library(oxenmq INTERFACE)
|
||||||
link_dep_libs(oxenmq INTERFACE "${LOKIMQ_LIBRARY_DIRS}" ${LOKIMQ_LIBRARIES})
|
link_dep_libs(oxenmq INTERFACE "${OXENMQ_LIBRARY_DIRS}" ${OXENMQ_LIBRARIES})
|
||||||
target_include_directories(oxenmq INTERFACE ${LOKIMQ_INCLUDE_DIRS})
|
target_include_directories(oxenmq INTERFACE ${OXENMQ_INCLUDE_DIRS})
|
||||||
add_library(oxenmq::oxenmq ALIAS oxenmq)
|
add_library(oxenmq::oxenmq ALIAS oxenmq)
|
||||||
message(STATUS "Found system liboxenmq ${LOKIMQ_VERSION}")
|
message(STATUS "Found system liboxenmq ${OXENMQ_VERSION}")
|
||||||
else()
|
else()
|
||||||
message(STATUS "using oxenmq submodule")
|
message(STATUS "using oxenmq submodule")
|
||||||
add_subdirectory(${CMAKE_SOURCE_DIR}/external/loki-mq)
|
add_subdirectory(${CMAKE_SOURCE_DIR}/external/oxen-mq)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
||||||
|
@ -315,7 +315,7 @@ if(SUBMODULE_CHECK)
|
||||||
check_submodule(external/date)
|
check_submodule(external/date)
|
||||||
check_submodule(external/pybind11)
|
check_submodule(external/pybind11)
|
||||||
check_submodule(external/sqlite_orm)
|
check_submodule(external/sqlite_orm)
|
||||||
check_submodule(external/loki-mq)
|
check_submodule(external/oxen-mq)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
1
external/loki-mq
vendored
1
external/loki-mq
vendored
|
@ -1 +0,0 @@
|
||||||
Subproject commit 506bd65b05b1cd5b11b4d1e3392306e4473f5ba3
|
|
1
external/oxen-mq
vendored
Submodule
1
external/oxen-mq
vendored
Submodule
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit f9ef827075cd4913ec077cb748d5db17d899152f
|
Loading…
Reference in a new issue