From 49708f209b13d628db1097140c86cf9ae5994676 Mon Sep 17 00:00:00 2001
From: gabime <gmelman1@gmail.com>
Date: Sat, 11 May 2019 12:28:36 +0300
Subject: [PATCH] fix inclusion of fmt

---
 include/spdlog/fmt/fmt.h           |  4 +-
 include/spdlog/impl/fmt-format.cpp | 64 ++++++++++++++++--------------
 2 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/include/spdlog/fmt/fmt.h b/include/spdlog/fmt/fmt.h
index bb644839..c8f47158 100644
--- a/include/spdlog/fmt/fmt.h
+++ b/include/spdlog/fmt/fmt.h
@@ -22,6 +22,6 @@
 #include "bundled/core.h"
 #include "bundled/format.h"
 #else // SPDLOG_FMT_EXTERNAL is defined - use external fmtlib
-#include <fmt/core.h>
-#include <fmt/format.h>
+#include "fmt/core.h"
+#include "fmt/format.h"
 #endif
diff --git a/include/spdlog/impl/fmt-format.cpp b/include/spdlog/impl/fmt-format.cpp
index dadfc8dd..70ccb8a3 100644
--- a/include/spdlog/impl/fmt-format.cpp
+++ b/include/spdlog/impl/fmt-format.cpp
@@ -5,55 +5,59 @@
 //
 // For the license information refer to format.h.
 
+#if !defined(SPDLOG_FMT_EXTERNAL)
+#include "spdlog/fmt/bundled/format-inl.h"
+#else
 #include "fmt/format-inl.h"
+#endif
 
 FMT_BEGIN_NAMESPACE
-template struct internal::basic_data<void>;
-template FMT_API internal::locale_ref::locale_ref(const std::locale &loc);
-template FMT_API std::locale internal::locale_ref::get<std::locale>() const;
+        template struct internal::basic_data<void>;
+        template FMT_API internal::locale_ref::locale_ref(const std::locale &loc);
+        template FMT_API std::locale internal::locale_ref::get<std::locale>() const;
 
 // Explicit instantiations for char.
 
-template FMT_API char internal::thousands_sep_impl(locale_ref);
+        template FMT_API char internal::thousands_sep_impl(locale_ref);
 
-template FMT_API void internal::basic_buffer<char>::append(const char *, const char *);
+        template FMT_API void internal::basic_buffer<char>::append(const char *, const char *);
 
-template FMT_API void internal::arg_map<format_context>::init(
-    const basic_format_args<format_context> &args);
+        template FMT_API void internal::arg_map<format_context>::init(
+                const basic_format_args<format_context> &args);
 
-template FMT_API int internal::char_traits<char>::format_float(
-    char *, std::size_t, const char *, int, double);
+        template FMT_API int internal::char_traits<char>::format_float(
+                char *, std::size_t, const char *, int, double);
 
-template FMT_API int internal::char_traits<char>::format_float(
-    char *, std::size_t, const char *, int, long double);
+        template FMT_API int internal::char_traits<char>::format_float(
+                char *, std::size_t, const char *, int, long double);
 
-template FMT_API std::string internal::vformat<char>(
-    string_view, basic_format_args<format_context>);
+        template FMT_API std::string internal::vformat<char>(
+                string_view, basic_format_args<format_context>);
 
-template FMT_API format_context::iterator internal::vformat_to(
-    internal::buffer &, string_view, basic_format_args<format_context>);
+        template FMT_API format_context::iterator internal::vformat_to(
+                internal::buffer &, string_view, basic_format_args<format_context>);
 
-template FMT_API void internal::sprintf_format(
-    double, internal::buffer &, core_format_specs);
-template FMT_API void internal::sprintf_format(
-    long double, internal::buffer &, core_format_specs);
+        template FMT_API void internal::sprintf_format(
+                double, internal::buffer &, core_format_specs);
+        template FMT_API void internal::sprintf_format(
+                long double, internal::buffer &, core_format_specs);
 
 // Explicit instantiations for wchar_t.
 
-template FMT_API wchar_t internal::thousands_sep_impl(locale_ref);
+        template FMT_API wchar_t internal::thousands_sep_impl(locale_ref);
 
-template FMT_API void internal::basic_buffer<wchar_t>::append(
-    const wchar_t *, const wchar_t *);
+        template FMT_API void internal::basic_buffer<wchar_t>::append(
+                const wchar_t *, const wchar_t *);
 
-template FMT_API void internal::arg_map<wformat_context>::init(
-    const basic_format_args<wformat_context> &);
+        template FMT_API void internal::arg_map<wformat_context>::init(
+                const basic_format_args<wformat_context> &);
 
-template FMT_API int internal::char_traits<wchar_t>::format_float(
-    wchar_t *, std::size_t, const wchar_t *, int, double);
+        template FMT_API int internal::char_traits<wchar_t>::format_float(
+                wchar_t *, std::size_t, const wchar_t *, int, double);
 
-template FMT_API int internal::char_traits<wchar_t>::format_float(
-    wchar_t *, std::size_t, const wchar_t *, int, long double);
+        template FMT_API int internal::char_traits<wchar_t>::format_float(
+                wchar_t *, std::size_t, const wchar_t *, int, long double);
 
-template FMT_API std::wstring internal::vformat<wchar_t>(
-    wstring_view, basic_format_args<wformat_context>);
+        template FMT_API std::wstring internal::vformat<wchar_t>(
+                wstring_view, basic_format_args<wformat_context>);
 FMT_END_NAMESPACE