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