diff --git a/.gitignore b/.gitignore index 6f10a00..dd74116 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ compile_commands.json *.old build/** +*.toml diff --git a/.gitmodules b/.gitmodules index e7f26c9..019897c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,13 @@ -[submodule "fmt"] - path = fmt - url = https://github.com/fmtlib/fmt [submodule "external/fmt"] path = external/fmt url = https://github.com/fmtlib/fmt [submodule "external/spdlog"] path = external/spdlog url = https://github.com/gabime/spdlog -[submodule "external/sqlite"] - path = external/sqlite - url = https://github.com/sqlite/sqlite +[submodule "external/tomlplusplus"] + path = external/tomlplusplus + url = https://github.com/marzer/tomlplusplus + +[submodule "external/bitsery"] + path = external/bitsery + url = https://github.com/fraillt/bitsery diff --git a/1x1.png b/1x1.png new file mode 100644 index 0000000..1914264 Binary files /dev/null and b/1x1.png differ diff --git a/CMakeLists.txt b/CMakeLists.txt index ab69ff8..4c02856 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,16 +8,19 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON) # Dependencies add_subdirectory(external/fmt) add_subdirectory(external/spdlog) - +add_subdirectory(external/tomlplusplus) +add_subdirectory(external/bitsery) # Executables add_executable(${PROJECT_NAME}-client src/main-tracker.cpp) add_executable(${PROJECT_NAME}-daemon src/main-daemon.cpp) # Common targets -set(COMMON_LIBS fmt spdlog) +set(COMMON_LIBS fmt spdlog tomlplusplus bitsery) set(COMMON_INCLUDES external/fmt/include external/spdlog/include + external/tomlplusplus/include + external/bitsery/include/bitsery ) # Apply common settings diff --git a/example-host-config.toml b/example-host-config.toml new file mode 100644 index 0000000..e69de29 diff --git a/external/bitsery b/external/bitsery new file mode 160000 index 0000000..9bebfd4 --- /dev/null +++ b/external/bitsery @@ -0,0 +1 @@ +Subproject commit 9bebfd4911b8ef52c5a67754ccb87a8fd5223414 diff --git a/external/tomlplusplus b/external/tomlplusplus new file mode 160000 index 0000000..e7aaccc --- /dev/null +++ b/external/tomlplusplus @@ -0,0 +1 @@ +Subproject commit e7aaccca3fa3dbde9818ab8313250f3da4976e37 diff --git a/src/main-daemon.cpp b/src/main-daemon.cpp index 0cb337b..5f8aa99 100644 --- a/src/main-daemon.cpp +++ b/src/main-daemon.cpp @@ -1,11 +1,14 @@ #include "spdlog/spdlog.h" #include - +#include // This is the *daemon* int main() { std::cout << "Hello from the email tracker's daemon (C++23)\n"; spdlog::info("Logger is functional."); + + auto config = toml::parse_file("host-config.toml"); + return 0; }