mirror of
https://github.com/oxen-io/lokinet.git
synced 2024-11-02 03:40:12 +00:00
Bring oxen-encoding back in as a submodule
As long as it's loaded before oxen-mq or libquic, this should end up being the one that gets used in oxen-mq/libquic, and so we don't have to update those when we want something in a newer oxen-encoding.
This commit is contained in:
parent
f21facfd39
commit
52b175772f
3
.gitmodules
vendored
3
.gitmodules
vendored
@ -35,3 +35,6 @@
|
||||
[submodule "external/span-lite"]
|
||||
path = external/span-lite
|
||||
url = https://github.com/martinmoene/span-lite.git
|
||||
[submodule "external/oxen-encoding"]
|
||||
path = external/oxen-encoding
|
||||
url = https://github.com/oxen-io/oxen-encoding.git
|
||||
|
3
external/CMakeLists.txt
vendored
3
external/CMakeLists.txt
vendored
@ -26,7 +26,9 @@ if(SUBMODULE_CHECK)
|
||||
message(STATUS "Checking submodules")
|
||||
check_submodule(CLI11)
|
||||
check_submodule(cpr)
|
||||
check_submodule(ghc-filesystem)
|
||||
check_submodule(nlohmann)
|
||||
check_submodule(oxen-encoding)
|
||||
check_submodule(oxen-libquic)
|
||||
check_submodule(oxen-mq)
|
||||
check_submodule(pybind11)
|
||||
@ -58,6 +60,7 @@ macro(system_or_submodule BIGNAME smallname pkgconf subdir)
|
||||
endif()
|
||||
endmacro()
|
||||
|
||||
system_or_submodule(OXENC oxenc liboxenc>=1.0.10 oxen-encoding)
|
||||
system_or_submodule(OXENMQ oxenmq liboxenmq>=1.2.14 oxen-mq)
|
||||
|
||||
set(JSON_BuildTests OFF CACHE INTERNAL "")
|
||||
|
1
external/oxen-encoding
vendored
Submodule
1
external/oxen-encoding
vendored
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit a7de63756dcc5c31cb899a4b810e6434b1a7c01c
|
Loading…
Reference in New Issue
Block a user