diff --git a/.gitmodules b/.gitmodules index 6f9e8c84..c1d9a0bf 100644 --- a/.gitmodules +++ b/.gitmodules @@ -31,3 +31,9 @@ [submodule "submodules/gtest-parallel"] path = submodules/gtest-parallel url = https://github.com/google/gtest-parallel.git +[submodule "submodules/spdlog"] + path = submodules/spdlog + url = https://github.com/gabime/spdlog.git +[submodule "submodules/fmt"] + path = submodules/fmt + url = https://github.com/fmtlib/fmt.git diff --git a/CMakeLists.txt b/CMakeLists.txt index c48e2df2..a4c52fc9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -536,6 +536,16 @@ add_subdirectory(crypto/ed25519-donna) add_subdirectory(nano/ipc_flatbuffers_lib) add_subdirectory(nano/ipc_flatbuffers_test) +# fmt +add_subdirectory(submodules/fmt EXCLUDE_FROM_ALL) +include_directories(submodules/fmt/include) + +# spdlog +add_definitions(-DSPDLOG_FMT_EXTERNAL) +add_subdirectory(submodules/spdlog EXCLUDE_FROM_ALL) +include_directories(submodules/spdlog/include) + +# miniupnp set(UPNPC_BUILD_SHARED OFF CACHE BOOL "") diff --git a/nano/lib/CMakeLists.txt b/nano/lib/CMakeLists.txt index d56f55e8..a15ef4c7 100644 --- a/nano/lib/CMakeLists.txt +++ b/nano/lib/CMakeLists.txt @@ -111,6 +111,8 @@ target_link_libraries( blake2 ${CRYPTOPP_LIBRARY} ${CMAKE_DL_LIBS} + fmt::fmt + spdlog::spdlog Boost::iostreams Boost::asio Boost::circular_buffer diff --git a/submodules/fmt b/submodules/fmt new file mode 160000 index 00000000..a0b8a92e --- /dev/null +++ b/submodules/fmt @@ -0,0 +1 @@ +Subproject commit a0b8a92e3d1532361c2f7feb63babc5c18d00ef2 diff --git a/submodules/spdlog b/submodules/spdlog new file mode 160000 index 00000000..7e635fca --- /dev/null +++ b/submodules/spdlog @@ -0,0 +1 @@ +Subproject commit 7e635fca68d014934b4af8a1cf874f63989352b7