Skip to content

Commit dca7dce

Browse files
committed
Replace submodule with oxen-logging system library
1 parent 6d5d7c2 commit dca7dce

File tree

3 files changed

+5
-12
lines changed

3 files changed

+5
-12
lines changed

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
[submodule "oxen-logging"]
2-
path = oxen-logging
3-
url = https://github.com/oxen-io/oxen-logging.git
41
[submodule "libpqxx"]
52
path = libpqxx
63
url = https://github.com/jtv/libpqxx.git

CMakeLists.txt

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,9 @@ add_library(spns STATIC
3333
find_package(PkgConfig REQUIRED)
3434

3535
pkg_check_modules(SODIUM REQUIRED IMPORTED_TARGET libsodium>=1.0.18)
36-
pkg_check_modules(OXENC REQUIRED IMPORTED_TARGET liboxenc>=1.0.4)
37-
pkg_check_modules(OXENMQ REQUIRED IMPORTED_TARGET liboxenmq>=1.2.14)
36+
pkg_check_modules(OXENC REQUIRED IMPORTED_TARGET liboxenc>=1.4.0)
37+
pkg_check_modules(OXENMQ REQUIRED IMPORTED_TARGET liboxenmq>=1.2.22)
38+
pkg_check_modules(OXENLOGGING REQUIRED IMPORTED_TARGET liboxen-logging>=1.2.0)
3839
pkg_check_modules(NLOHMANN_JSON REQUIRED IMPORTED_TARGET nlohmann_json>=3.7.0)
3940
pkg_check_modules(SYSTEMD REQUIRED IMPORTED_TARGET libsystemd)
4041

@@ -74,27 +75,23 @@ if(SUBMODULE_CHECK)
7475
endfunction ()
7576

7677
message(STATUS "Checking submodules")
77-
check_submodule(oxen-logging fmt spdlog)
7878
check_submodule(libpqxx)
7979
check_submodule(pybind11)
8080

8181
endif()
8282
endif()
8383

84-
set(OXEN_LOGGING_SOURCE_ROOT "${PROJECT_SOURCE_DIR}" CACHE INTERNAL "")
85-
add_subdirectory(oxen-logging)
86-
8784
add_subdirectory(libpqxx EXCLUDE_FROM_ALL)
8885

8986
target_link_libraries(spns PRIVATE
9087
PkgConfig::SODIUM
9188
PkgConfig::OXENC
9289
PkgConfig::OXENMQ
90+
PkgConfig::OXENLOGGING
9391
PkgConfig::NLOHMANN_JSON
9492
PkgConfig::SYSTEMD
9593
PUBLIC
96-
pqxx
97-
oxen::logging)
94+
pqxx)
9895

9996
set_target_properties(spns PROPERTIES INTERPROCEDURAL_OPTIMIZATION ON)
10097

oxen-logging

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)