Use external libfmt by default

Last-Changed: Sun, May, 14 2020

Gbp-Pq: Name use-external-fmt.patch

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 508a0b6577273a2b80d1726b19d2f4879dfcc811..7b9ede8d3b7759755859e32708efe60e7650beaf 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,7 +70,7 @@ option(SPDLOG_SANITIZE_ADDRESS "Enable address sanitizer in tests" OFF)
 
 # install options
 option(SPDLOG_INSTALL "Generate the install target" ${SPDLOG_MASTER_PROJECT})
-option(SPDLOG_FMT_EXTERNAL "Use external fmt library instead of bundled" OFF)
+option(SPDLOG_FMT_EXTERNAL "Use external fmt library instead of bundled" ON)
 option(SPDLOG_FMT_EXTERNAL_HO "Use external fmt header-only library instead of bundled" OFF)
 option(SPDLOG_NO_EXCEPTIONS "Compile with -fno-exceptions. Call abort() on any spdlog exceptions" OFF)
 

diff --git a/include/spdlog/fmt/bin_to_hex.h b/include/spdlog/fmt/bin_to_hex.h
index de1260613db9a4efd62275090824d6195b0cb3d9..655ca60d3a384623d2c7875ca70f91c94878337f 100644 (file)
--- a/include/spdlog/fmt/bin_to_hex.h
+++ b/include/spdlog/fmt/bin_to_hex.h
@@ -4,7 +4,7 @@
 //
 
 #pragma once
-
+#include <spdlog/tweakme.h>
 //
 // Support for logging binary data as hex
 // format flags:

diff --git a/include/spdlog/fmt/fmt.h b/include/spdlog/fmt/fmt.h
index 289979aa6c42d4ae096095c79641690834c40367..f71037a770c516fb33f42fc4160810ec735a0b2c 100644 (file)
--- a/include/spdlog/fmt/fmt.h
+++ b/include/spdlog/fmt/fmt.h
@@ -4,7 +4,7 @@
 //
 
 #pragma once
-
+#include <spdlog/tweakme.h>
 //
 // Include a bundled header-only copy of fmtlib or an external one.
 // By default spdlog include its own copy.
@@ -24,4 +24,4 @@
 #else // SPDLOG_FMT_EXTERNAL is defined - use external fmtlib
 #include <fmt/core.h>
 #include <fmt/format.h>
-#endif
\ No newline at end of file
+#endif

diff --git a/include/spdlog/fmt/ostr.h b/include/spdlog/fmt/ostr.h
index f82eb679ba1b27678c983699a70edc98f313a62f..81c46bfdadaa06cdc29be0979e1dd2351f2b3f2d 100644 (file)
--- a/include/spdlog/fmt/ostr.h
+++ b/include/spdlog/fmt/ostr.h
@@ -7,7 +7,7 @@
 //
 // include bundled or external copy of fmtlib's ostream support
 //
-
+#include <spdlog/tweakme.h>
 #if !defined(SPDLOG_FMT_EXTERNAL)
 #ifdef SPDLOG_HEADER_ONLY
 #ifndef FMT_HEADER_ONLY

diff --git a/include/spdlog/tweakme.h b/include/spdlog/tweakme.h
index b67043e0c7b7581e058b78bcc6fe4da2c6a6f9ad..f954d7b9824c626004a0ee7d3c4a455dbebf3e69 100644 (file)
--- a/include/spdlog/tweakme.h
+++ b/include/spdlog/tweakme.h
@@ -70,7 +70,7 @@
 // In this case spdlog will try to include <fmt/format.h> so set your -I flag
 // accordingly.
 //
-// #define SPDLOG_FMT_EXTERNAL
+#define SPDLOG_FMT_EXTERNAL /usr/include/fmt
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////

diff --git a/src/fmt.cpp b/src/fmt.cpp
index 973dcad557b7e8c94ff3d5d054ecdf5cdc00aff5..ec33d1026fffe39d664e99af8066c918f4106591 100644 (file)
--- a/src/fmt.cpp
+++ b/src/fmt.cpp
@@ -6,6 +6,7 @@
 // Copyright (c) 2012 - 2016, Victor Zverovich
 // All rights reserved.
 
+#include <spdlog/tweakme.h>
 #if !defined(SPDLOG_FMT_EXTERNAL)
 #include "spdlog/fmt/bundled/format-inl.h"