Merge branch 'dev' of github.com:flueke/mesytec-mvlc into dev

flueke · Dec 4, 2024 · 2f99d85 · 2f99d85
2 parents a98edb3 + ad82298
commit 2f99d85
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/mesytec-mvlc/CMakeLists.txt b/src/mesytec-mvlc/CMakeLists.txt
@@ -102,6 +102,7 @@ set(MVLC_SPDLOG_ACTIVE_LEVEL "SPDLOG_LEVEL_WARN" CACHE STRING "Compile time spdl
 
 target_compile_definitions(mesytec-mvlc PRIVATE SPDLOG_ACTIVE_LEVEL=${MVLC_SPDLOG_ACTIVE_LEVEL})
 target_compile_options(mesytec-mvlc PRIVATE -Wall -Wextra -Wimplicit-fallthrough PUBLIC -Wno-gnu-anonymous-struct)
+target_compile_options(mesytec-mvlc PUBLIC -Wno-dangling-reference) # to silence spdlog warnings with some gcc-14
 target_compile_features(mesytec-mvlc PUBLIC cxx_std_17)
 
 if (WIN32)

diff --git a/src/mesytec-mvlc/util/logging.cc b/src/mesytec-mvlc/util/logging.cc
@@ -20,12 +20,14 @@ std::shared_ptr<spdlog::logger>
         if (!sinks.empty())
         {
             logger = std::make_shared<spdlog::logger>(name, std::begin(sinks), std::end(sinks));
-            spdlog::register_logger(logger);
         }
         else
         {
             logger = spdlog::stdout_color_mt(name);
         }
+
+        if (logger)
+            spdlog::register_logger(logger);
     }
 
     return logger;