Merge remote-tracking branch 'origin/v1.x' into pwm1234/rotate_on_open
This commit is contained in:
Philip Miller
commit
cce1e36e26
@ -4,7 +4,7 @@
|
||||
#
|
||||
|
||||
cmake_minimum_required(VERSION 3.1)
|
||||
project(spdlog VERSION 1.3.0 LANGUAGES CXX)
|
||||
project(spdlog VERSION 1.3.1 LANGUAGES CXX)
|
||||
include(CMakeDependentOption)
|
||||
include(GNUInstallDirs)
|
||||
|
||||
@ -30,7 +30,6 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" MATCH
|
||||
add_compile_options("-Wconversion")
|
||||
add_compile_options("-pedantic")
|
||||
add_compile_options("-Wfatal-errors")
|
||||
|
||||
endif()
|
||||
|
||||
#---------------------------------------------------------------------------------------
|
||||
@ -47,11 +46,11 @@ add_library(spdlog::spdlog ALIAS spdlog)
|
||||
# Check if spdlog is being used directly or via add_subdirectory
|
||||
set(SPDLOG_MASTER_PROJECT OFF)
|
||||
if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
|
||||
set(SPDLOG_MASTER_PROJECT ON)
|
||||
set(SPDLOG_MASTER_PROJECT ON)
|
||||
endif()
|
||||
|
||||
option(SPDLOG_BUILD_EXAMPLES "Build examples" ${SPDLOG_MASTER_PROJECT})
|
||||
option(SPDLOG_BUILD_BENCH "Build benchmarks" ${SPDLOG_MASTER_PROJECT})
|
||||
option(SPDLOG_BUILD_BENCH "Build benchmarks (Requires https://github.com/google/benchmark.git to be installed)" OFF)
|
||||
option(SPDLOG_BUILD_TESTS "Build tests" ${SPDLOG_MASTER_PROJECT})
|
||||
option(SPDLOG_FMT_EXTERNAL "Use external fmt library instead of bundled" OFF)
|
||||
|
||||
|
||||
@ -91,7 +91,7 @@ int main()
|
||||
spdlog::info("Positional args are {1} {0}..", "too", "supported");
|
||||
spdlog::info("{:<30}", "left aligned");
|
||||
|
||||
spdlog::set_level(spdlog::level::debug/ Set global log level to debug
|
||||
spdlog::set_level(spdlog::level::debug); // Set global log level to debug
|
||||
spdlog::debug("This message should be displayed..");
|
||||
|
||||
// change log pattern
|
||||
|
||||
@ -30,20 +30,19 @@ if(NOT TARGET spdlog)
|
||||
endif()
|
||||
|
||||
find_package(Threads REQUIRED)
|
||||
find_package(benchmark CONFIG REQUIRED)
|
||||
|
||||
add_executable(bench bench.cpp)
|
||||
target_link_libraries(bench spdlog::spdlog Threads::Threads)
|
||||
target_link_libraries(bench PRIVATE spdlog::spdlog Threads::Threads)
|
||||
|
||||
add_executable(async_bench async_bench.cpp)
|
||||
target_link_libraries(async_bench spdlog::spdlog Threads::Threads)
|
||||
target_link_libraries(async_bench PRIVATE spdlog::spdlog Threads::Threads)
|
||||
|
||||
add_executable(latency latency.cpp)
|
||||
set(CMAKE_CXX_STANDARD_LIBRARIES -lbenchmark)
|
||||
target_link_libraries(latency spdlog::spdlog Threads::Threads)
|
||||
target_link_libraries(latency PRIVATE benchmark::benchmark spdlog::spdlog Threads::Threads)
|
||||
|
||||
|
||||
add_executable(formatter-bench formatter-bench.cpp)
|
||||
set(CMAKE_CXX_STANDARD_LIBRARIES -lbenchmark)
|
||||
target_link_libraries(formatter-bench spdlog::spdlog Threads::Threads)
|
||||
target_link_libraries(formatter-bench PRIVATE benchmark::benchmark spdlog::spdlog Threads::Threads)
|
||||
|
||||
file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/logs")
|
||||
|
||||
@ -25,9 +25,9 @@ struct log_msg
|
||||
|
||||
#ifndef SPDLOG_NO_THREAD_ID
|
||||
, thread_id(os::thread_id())
|
||||
#endif
|
||||
, source(loc)
|
||||
, payload(view)
|
||||
#endif
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
#pragma once
|
||||
|
||||
#ifndef SPDLOG_H
|
||||
#error "spdlog.h must be included before this file."
|
||||
#include "spdlog/spdlog.h"
|
||||
#endif
|
||||
|
||||
#include "spdlog/details/fmt_helper.h"
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
#pragma once
|
||||
|
||||
#ifndef SPDLOG_H
|
||||
#error "spdlog.h must be included before this file."
|
||||
#include "spdlog/spdlog.h"
|
||||
#endif
|
||||
|
||||
#include "spdlog/details/console_globals.h"
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
#pragma once
|
||||
|
||||
#ifndef SPDLOG_H
|
||||
#error "spdlog.h must be included before this file."
|
||||
#include "spdlog/spdlog.h"
|
||||
#endif
|
||||
|
||||
#include "spdlog/details/file_helper.h"
|
||||
@ -30,6 +30,11 @@ public:
|
||||
file_helper_.open(filename, truncate);
|
||||
}
|
||||
|
||||
const filename_t &filename() const
|
||||
{
|
||||
return file_helper_.filename();
|
||||
}
|
||||
|
||||
protected:
|
||||
void sink_it_(const details::log_msg &msg) override
|
||||
{
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
#pragma once
|
||||
|
||||
#ifndef SPDLOG_H
|
||||
#error "spdlog.h must be included before this file."
|
||||
#include "spdlog/spdlog.h"
|
||||
#endif
|
||||
|
||||
#include "spdlog/details/file_helper.h"
|
||||
@ -63,6 +63,11 @@ public:
|
||||
rotation_tp_ = next_rotation_tp_();
|
||||
}
|
||||
|
||||
const filename_t &filename() const
|
||||
{
|
||||
return file_helper_.filename();
|
||||
}
|
||||
|
||||
protected:
|
||||
void sink_it_(const details::log_msg &msg) override
|
||||
{
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
#pragma once
|
||||
|
||||
#ifndef SPDLOG_H
|
||||
#error "spdlog.h must be included before this file."
|
||||
#include "spdlog/spdlog.h"
|
||||
#endif
|
||||
|
||||
#include "base_sink.h"
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
#pragma once
|
||||
|
||||
#ifndef SPDLOG_H
|
||||
#error "spdlog.h must be included before this file."
|
||||
#include "spdlog/spdlog.h"
|
||||
#endif
|
||||
|
||||
#if defined(_WIN32)
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
#pragma once
|
||||
|
||||
#ifndef SPDLOG_H
|
||||
#error "spdlog.h must be included before this file."
|
||||
#include "spdlog/spdlog.h"
|
||||
#endif
|
||||
|
||||
#include "spdlog/details/null_mutex.h"
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
#pragma once
|
||||
|
||||
#ifndef SPDLOG_H
|
||||
#error "spdlog.h must be included before this file."
|
||||
#include "spdlog/spdlog.h"
|
||||
#endif
|
||||
|
||||
#include "spdlog/details/null_mutex.h"
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
#pragma once
|
||||
|
||||
#ifndef SPDLOG_H
|
||||
#error "spdlog.h must be included before this file."
|
||||
#include "spdlog/spdlog.h"
|
||||
#endif
|
||||
|
||||
#include "spdlog/details/file_helper.h"
|
||||
@ -60,6 +60,11 @@ public:
|
||||
return fmt::to_string(w);
|
||||
}
|
||||
|
||||
const filename_t &filename() const
|
||||
{
|
||||
return file_helper_.filename();
|
||||
}
|
||||
|
||||
protected:
|
||||
void sink_it_(const details::log_msg &msg) override
|
||||
{
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
#pragma once
|
||||
|
||||
#ifndef SPDLOG_H
|
||||
#error "spdlog.h must be included before this file."
|
||||
#include "spdlog/spdlog.h"
|
||||
#endif
|
||||
|
||||
#ifdef _WIN32
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
#pragma once
|
||||
|
||||
#ifndef SPDLOG_H
|
||||
#error "spdlog.h must be included before this file."
|
||||
#include "spdlog/spdlog.h"
|
||||
#endif
|
||||
|
||||
#include "spdlog/details/console_globals.h"
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
#pragma once
|
||||
|
||||
#ifndef SPDLOG_H
|
||||
#error "spdlog.h must be included before this file."
|
||||
#include "spdlog/spdlog.h"
|
||||
#endif
|
||||
|
||||
#include "spdlog/sinks/base_sink.h"
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
#pragma once
|
||||
|
||||
#ifndef SPDLOG_H
|
||||
#error "spdlog.h must be included before this file."
|
||||
#include "spdlog/spdlog.h"
|
||||
#endif
|
||||
|
||||
#include "spdlog/common.h"
|
||||
|
||||
@ -7,6 +7,6 @@
|
||||
|
||||
#define SPDLOG_VER_MAJOR 1
|
||||
#define SPDLOG_VER_MINOR 3
|
||||
#define SPDLOG_VER_PATCH 0
|
||||
#define SPDLOG_VER_PATCH 1
|
||||
|
||||
#define SPDLOG_VERSION (SPDLOG_VER_MAJOR * 10000 + SPDLOG_VER_MINOR * 100 + SPDLOG_VER_PATCH)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user