diff --git a/conanfile.txt b/conanfile.txt index f7c88b83..ef6b957a 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -1,17 +1,17 @@ [requires] -cli11/2.1.1 -date/2.4.1 -eigen/3.3.9 +cli11/2.1.2 +date/3.0.1 +eigen/3.4.0 gtest/1.10.0 -h5cpp/0.4.1@ess-dmsc/testing -nlohmann_json/3.9.1 -librdkafka/1.6.0 +fmt/8.1.1 +librdkafka/1.8.2 +nlohmann_json/3.10.5 +spdlog/1.9.2 +h5cpp/0.4.1@ess-dmsc/stable logical-geometry/705ea61@ess-dmsc/stable -qplot/6e192ab@ess-dmsc/testing -Qt-Color-Widgets/9f4e052@ess-dmsc/testing +qplot/6e192ab@ess-dmsc/stable +Qt-Color-Widgets/9f4e052@ess-dmsc/stable streaming-data-types/6a41aee@ess-dmsc/stable -spdlog/1.3.1@bincrafters/stable -fmt/5.3.0@bincrafters/stable [generators] cmake diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 15e6630b..a1545dac 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -3,9 +3,9 @@ include(BuildInfo) find_package(date REQUIRED) find_package(fmt REQUIRED) +find_package(spdlog REQUIRED) find_package(h5cpp 0.4.0 REQUIRED) find_package(Threads REQUIRED) -add_definitions("-DGRAYLOG") add_subdirectory(core) add_subdirectory(consumers) diff --git a/source/core/CMakeLists.txt b/source/core/CMakeLists.txt index 73c5ddfb..a9f979b0 100644 --- a/source/core/CMakeLists.txt +++ b/source/core/CMakeLists.txt @@ -58,9 +58,9 @@ target_include_directories( target_link_libraries( ${this_target} PUBLIC ${COVERAGE_LIBRARIES} - PUBLIC ${GraylogLogger_STATIC_LIBRARIES} PUBLIC h5cpp::h5cpp PUBLIC fmt::fmt + PUBLIC spdlog::spdlog PUBLIC ${DATE_LIBRARIES} PRIVATE Threads::Threads ) diff --git a/source/core/util/logger.cpp b/source/core/util/logger.cpp index 103e5f20..e5c619c0 100644 --- a/source/core/util/logger.cpp +++ b/source/core/util/logger.cpp @@ -15,14 +15,14 @@ template class ostream_sink final : public spdlog::sinks::base_sink { public: - ostream_sink(std::ostream* gui_stream) + explicit ostream_sink(std::ostream* gui_stream) : outStream(gui_stream) {} protected: void sink_it_(const spdlog::details::log_msg& msg) override { - fmt::memory_buffer formatted; + spdlog::memory_buf_t formatted; spdlog::sinks::base_sink::formatter_->format(msg, formatted); (*outStream) << fmt::to_string(formatted); }