From 7c107cb648bab86681de7c1d898b50e60ac969bd Mon Sep 17 00:00:00 2001 From: bergmann Date: Tue, 25 Jun 2019 00:46:14 +0200 Subject: [PATCH] * added global log macro --- include/cpplogging/interface.h | 2 +- include/cpplogging/interface/global.h | 10 ++++++++++ src/CMakeLists.txt | 6 +++--- 3 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 include/cpplogging/interface/global.h diff --git a/include/cpplogging/interface.h b/include/cpplogging/interface.h index dac2b28..fb2e66c 100644 --- a/include/cpplogging/interface.h +++ b/include/cpplogging/interface.h @@ -1,4 +1,4 @@ #pragma once +#include "interface/global.h" #include "interface/logger.h" -#include "interface/types.h" diff --git a/include/cpplogging/interface/global.h b/include/cpplogging/interface/global.h new file mode 100644 index 0000000..b3fade8 --- /dev/null +++ b/include/cpplogging/interface/global.h @@ -0,0 +1,10 @@ +#pragma once + +#include "logger.h" + +#define cpplogging_global_log(p_level) \ + if (::cpplogging::logger::get().is_enabled(::cpplogging::log_level::p_level)) \ + ::cpplogging::logger::get().log() \ + .level(::cpplogging::log_level::p_level) \ + .file(__FILE__) \ + .line(__LINE__) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 76b4e6c..e8a557c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -28,8 +28,8 @@ EndIf ( ) # Object Library ################################################################################## Set ( CMAKE_POSITION_INDEPENDENT_CODE ON ) -Set ( CPPLOGGING_GENERATED_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/generated/include ) Set ( CPPLOGGING_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../include ) +Set ( CPPLOGGING_GENERATED_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/generated/include ) Configure_File ( ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/config.h.in ${CPPLOGGING_GENERATED_INCLUDE_DIR}/cpplogging/config.h ) File ( GLOB_RECURSE CPPLOGGING_HEADER_FILES ${CPPLOGGING_INCLUDE_DIR}/*.h ) @@ -96,10 +96,10 @@ EndIf ( ) # Header If ( CPPLOGGING_INSTALL_HEADER ) - Install ( DIRECTORY ${CPPLOGGING_GENERATED_INCLUDE_DIR}/cpplogging - DESTINATION ${CPPLOGGING_INSTALL_DIR_INCLUDE} ) Install ( DIRECTORY ${CPPLOGGING_INCLUDE_DIR}/cpplogging DESTINATION ${CPPLOGGING_INSTALL_DIR_INCLUDE} ) + Install ( DIRECTORY ${CPPLOGGING_GENERATED_INCLUDE_DIR}/cpplogging + DESTINATION ${CPPLOGGING_INSTALL_DIR_INCLUDE} ) EndIf ( ) # Static