diff options
| author |   Ryan Volz <ryan.volz@gmail.com> | 2021-12-07 17:52:48 -0500 |
|---|---|---|
| committer |   mormj <34754695+mormj@users.noreply.github.com> | 2021-12-10 13:37:11 -0500 |
| commit | 219d86c899d644a4976561a76279f1ce4ca1649d (patch) | |
| tree | 9f4f67bc6e7eb8303e96ddf1681c0588161c736f /gnuradio-runtime | |
| parent | uhd: pybind rfnoc_{block, ddc, duc, rx/tx_radio} (#5291) (diff) | |
| download | gnuradio-219d86c899d644a4976561a76279f1ce4ca1649d.tar.xz gnuradio-219d86c899d644a4976561a76279f1ce4ca1649d.zip | |
runtime: Use <spdlog/fmt/fmt.h> header handling SPDLOG_FMT_EXTERNAL
Regardless of how spdlog was built (with/without SPDLOG_FMT_EXTERNAL),
this ensures that the proper fmt headers are included. This makes it so
that fmt is not a required dependency when spdlog is built with
SPDLOG_FMT_EXTERNAL=OFF.
Signed-off-by: Ryan Volz <ryan.volz@gmail.com>
Diffstat (limited to 'gnuradio-runtime')
| -rw-r--r-- | gnuradio-runtime/include/gnuradio/logger.h | 6 | ||||
| -rw-r--r-- | gnuradio-runtime/python/gnuradio/gr/bindings/logger_python.cc | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/gnuradio-runtime/include/gnuradio/logger.h b/gnuradio-runtime/include/gnuradio/logger.h index 659911434..56c660fa7 100644 --- a/gnuradio-runtime/include/gnuradio/logger.h +++ b/gnuradio-runtime/include/gnuradio/logger.h @@ -33,14 +33,10 @@ using logger_ptr = std::shared_ptr<void>; // keeps as short as possible; if anything is needed only by the implementation in // buffer.cc, then only include it there #include <gnuradio/api.h> -#include <fmt/core.h> -#include <fmt/format.h> #include <spdlog/common.h> +#include <spdlog/fmt/fmt.h> #include <memory> -#ifndef SPDLOG_FMT_EXTERNAL -#define SPDLOG_FMT_EXTERNAL -#endif #include <spdlog/spdlog.h> #include <spdlog/sinks/dist_sink.h> diff --git a/gnuradio-runtime/python/gnuradio/gr/bindings/logger_python.cc b/gnuradio-runtime/python/gnuradio/gr/bindings/logger_python.cc index 2d7b45067..1b927ea3d 100644 --- a/gnuradio-runtime/python/gnuradio/gr/bindings/logger_python.cc +++ b/gnuradio-runtime/python/gnuradio/gr/bindings/logger_python.cc @@ -15,7 +15,7 @@ /* BINDTOOL_GEN_AUTOMATIC(0) */ /* BINDTOOL_USE_PYGCCXML(0) */ /* BINDTOOL_HEADER_FILE(logger.h) */ -/* BINDTOOL_HEADER_FILE_HASH(1b018cc2df46366b8b83a4fe08db2806) */ +/* BINDTOOL_HEADER_FILE_HASH(3e2c7677a98ddd539794627cd5a43d93) */ /***********************************************************************************/ #include <pybind11/complex.h> |