Gitiles
Code Review Sign In
gerrit.openbmc.org / mdmillerii / openbmc / 273ca5bc370e78b82112e9cd56b316cc29a5064a / . / meta-openembedded / meta-oe / recipes-support / spdlog / files / 0001-Enable-use-of-external-fmt-library.patch
blob: 98c342fec4a8688add3ec83d49594752dc6ddfc1 [file] [log] [blame]
Andrew Geissler7e0e3c02022-02-25 20:34:39 +0000[diff] [blame]1Author: Nilesh Patra <npatra974@gmail.com>
2Description: Use external libfmt by default
3Last-Changed: Sun, May, 14 2020
4Forwarded: not-needed
5--- a/CMakeLists.txt
6+++ b/CMakeLists.txt
7@@ -87,7 +87,7 @@ option(SPDLOG_BUILD_WARNINGS "Enable com
8
9 # install options
10 option(SPDLOG_INSTALL "Generate the install target" ${SPDLOG_MASTER_PROJECT})
11-option(SPDLOG_FMT_EXTERNAL "Use external fmt library instead of bundled" OFF)
12+option(SPDLOG_FMT_EXTERNAL "Use external fmt library instead of bundled" ON)
13 option(SPDLOG_FMT_EXTERNAL_HO "Use external fmt header-only library instead of bundled" OFF)
14 option(SPDLOG_NO_EXCEPTIONS "Compile with -fno-exceptions. Call abort() on any spdlog exceptions" OFF)
15
Andrew Geissler8fc454f2020-12-11 16:27:59 -0600[diff] [blame]16--- a/include/spdlog/tweakme.h
17+++ b/include/spdlog/tweakme.h
Andrew Geissler7e0e3c02022-02-25 20:34:39 +0000[diff] [blame]18@@ -71,7 +71,7 @@
Andrew Geissler8fc454f2020-12-11 16:27:59 -0600[diff] [blame]19 // In this case spdlog will try to include <fmt/format.h> so set your -I flag
20 // accordingly.
21 //
22-// #define SPDLOG_FMT_EXTERNAL
Andrew Geissler7e0e3c02022-02-25 20:34:39 +0000[diff] [blame]23+#define SPDLOG_FMT_EXTERNAL 1
Andrew Geissler8fc454f2020-12-11 16:27:59 -0600[diff] [blame]24 ///////////////////////////////////////////////////////////////////////////////
25
26 ///////////////////////////////////////////////////////////////////////////////
Andrew Geissler7e0e3c02022-02-25 20:34:39 +0000[diff] [blame]27--- a/include/spdlog/fmt/bin_to_hex.h
28+++ b/include/spdlog/fmt/bin_to_hex.h
29@@ -5,6 +5,7 @@
30
31 #pragma once
32
33+#include <spdlog/tweakme.h>
34 #include <cctype>
35 #include <spdlog/common.h>
36
37--- a/include/spdlog/fmt/fmt.h
38+++ b/include/spdlog/fmt/fmt.h
39@@ -4,7 +4,7 @@
40 //
41
42 #pragma once
43-
44+#include <spdlog/tweakme.h>
45 //
46 // Include a bundled header-only copy of fmtlib or an external one.
47 // By default spdlog include its own copy.
48--- a/include/spdlog/fmt/ostr.h
49+++ b/include/spdlog/fmt/ostr.h
50@@ -7,7 +7,7 @@
51 //
52 // include bundled or external copy of fmtlib's ostream support
53 //
54-
55+#include <spdlog/tweakme.h>
56 #if !defined(SPDLOG_FMT_EXTERNAL)
57 # ifdef SPDLOG_HEADER_ONLY
58 # ifndef FMT_HEADER_ONLY
59--- a/src/fmt.cpp
60+++ b/src/fmt.cpp
61@@ -6,6 +6,7 @@
62 # error Please define SPDLOG_COMPILED_LIB to compile this file.
63 #endif
64
65+#include <spdlog/tweakme.h>
66 #if !defined(SPDLOG_FMT_EXTERNAL)
67 # include <spdlog/fmt/bundled/format-inl.h>
68