From 1523c83650ce1d9bc1615b4dbf7be70760ce06da Mon Sep 17 00:00:00 2001 From: gabime Date: Wed, 14 Jul 2021 14:28:34 +0300 Subject: [PATCH] Added fmt/compile.h bundled file --- CMakeLists.txt | 2 +- example/example.cpp | 3 ++- include/spdlog/fmt/compile.h | 20 ++++++++++++++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 include/spdlog/fmt/compile.h diff --git a/CMakeLists.txt b/CMakeLists.txt index d7fc940f..be362788 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,7 +33,7 @@ endif () # Compiler config # --------------------------------------------------------------------------------------- if (NOT CMAKE_CXX_STANDARD) - set(CMAKE_CXX_STANDARD 11) + set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) endif () diff --git a/example/example.cpp b/example/example.cpp index 0649a65e..a5abc273 100644 --- a/example/example.cpp +++ b/example/example.cpp @@ -23,13 +23,14 @@ void custom_flags_example(); #include "spdlog/spdlog.h" #include "spdlog/cfg/env.h" // support for loading levels from the environment variable +#include "spdlog/fmt/compile.h" int main(int, char *[]) { // Log levels can be loaded from argv/env using "SPDLOG_LEVEL" load_levels_example(); - spdlog::info("Welcome to spdlog version {}.{}.{} !", SPDLOG_VER_MAJOR, SPDLOG_VER_MINOR, SPDLOG_VER_PATCH); + spdlog::info(FMT_COMPILE("Welcome to spdlog version {}.{}.{} {:d} !"), SPDLOG_VER_MAJOR, SPDLOG_VER_MINOR, SPDLOG_VER_PATCH, "SS"); spdlog::warn("Easy padding in numbers like {:08d}", 12); spdlog::critical("Support for int: {0:d}; hex: {0:x}; oct: {0:o}; bin: {0:b}", 42); diff --git a/include/spdlog/fmt/compile.h b/include/spdlog/fmt/compile.h new file mode 100644 index 00000000..14b410a1 --- /dev/null +++ b/include/spdlog/fmt/compile.h @@ -0,0 +1,20 @@ +// +// Copyright(c) 2016 Gabi Melman. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) +// + +#pragma once +// +// include bundled or external copy of fmtlib's ostream support +// + +#if !defined(SPDLOG_FMT_EXTERNAL) +#ifdef SPDLOG_HEADER_ONLY +#ifndef FMT_HEADER_ONLY +#define FMT_HEADER_ONLY +#endif +#endif +#include +#else +#include +#endif