[med-svn] [Git][med-team/spdlog][master] Use system libfmt by default

[Nilesh Patra]

Nilesh Patra pushed to branch master at Debian Med / spdlog


Commits:
59f7057e by Nilesh Patra at 2020-06-14T14:26:37+00:00
Use system libfmt by default

- - - - -


2 changed files:

- debian/patches/series
- + debian/patches/use-external-fmt.patch


Changes:

=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
 autopkgtest
+use-external-fmt.patch


=====================================
debian/patches/use-external-fmt.patch
=====================================
@@ -0,0 +1,75 @@
+Author: Nilesh Patra <npatra974 at gmail.com>
+Description: Use external libfmt by default
+Last-Changed: Sun, May, 14 2020
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -70,7 +70,7 @@
+ 
+ # 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)
+ 
+--- 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
+ ///////////////////////////////////////////////////////////////////////////////
+ 
+ ///////////////////////////////////////////////////////////////////////////////
+--- 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:
+--- 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
+--- 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
+--- 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"
+ 



View it on GitLab: https://salsa.debian.org/med-team/spdlog/-/commit/59f7057e3a15f5092456dfb3037357cbf36af7ca

-- 
View it on GitLab: https://salsa.debian.org/med-team/spdlog/-/commit/59f7057e3a15f5092456dfb3037357cbf36af7ca
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20200614/cb3e0580/attachment-0001.html>