mirrors/spdlog
1
0
Fork 0
mirror of https://github.com/gabime/spdlog.git synced 2024-11-15 08:25:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

clang-format

Browse Source
This commit is contained in:
gabime 2020-08-26 00:10:05 +03:00
parent 23c2c00d69
commit cd701761f9
4 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -192,7 +192,8 @@ endif()
# Misc definitions according to tweak options
# ---------------------------------------------------------------------------------------
set(SPDLOG_WCHAR_TO_UTF8_SUPPORT ${SPDLOG_WCHAR_SUPPORT})
foreach(SPDLOG_OPTION
foreach(
SPDLOG_OPTION
SPDLOG_WCHAR_TO_UTF8_SUPPORT
SPDLOG_WCHAR_FILENAMES
SPDLOG_NO_EXCEPTIONS
@ -200,8 +201,7 @@ foreach(SPDLOG_OPTION
SPDLOG_PREVENT_CHILD_FD
SPDLOG_NO_THREAD_ID
SPDLOG_NO_TLS
SPDLOG_NO_ATOMIC_LEVELS
)
SPDLOG_NO_ATOMIC_LEVELS)
if(${SPDLOG_OPTION})
target_compile_definitions(spdlog PUBLIC ${SPDLOG_OPTION})
target_compile_definitions(spdlog_header_only INTERFACE ${SPDLOG_OPTION})

6
include/spdlog/details/fmt_helper.h
View File

@ -38,11 +38,11 @@ inline unsigned int count_digits(T n)
// fmt 7.0.0 renamed the internal namespace to detail.
// See: https://github.com/fmtlib/fmt/issues/1538
#if FMT_VERSION < 70000
internal
internal
#else
detail
detail
#endif
::count_digits(static_cast<count_type>(n)));
::count_digits(static_cast<count_type>(n)));
}
inline void pad2(int n, memory_buf_t &dest)

32
tests/CMakeLists.txt
View File

@ -1,17 +1,17 @@
cmake_minimum_required(VERSION 3.10)
project(spdlog_utests CXX)
if (NOT TARGET spdlog)
if(NOT TARGET spdlog)
# Stand-alone build
find_package(spdlog REQUIRED)
endif ()
endif()
include(../cmake/utils.cmake)
find_package(PkgConfig)
if (PkgConfig_FOUND)
if(PkgConfig_FOUND)
pkg_check_modules(systemd libsystemd)
endif ()
endif()
set(SPDLOG_UTESTS_SOURCES
test_file_helper.cpp
@ -34,13 +34,13 @@ set(SPDLOG_UTESTS_SOURCES
test_cfg.cpp
test_time_point.cpp)
if (NOT SPDLOG_NO_EXCEPTIONS)
if(NOT SPDLOG_NO_EXCEPTIONS)
list(APPEND SPDLOG_UTESTS_SOURCES test_errors.cpp)
endif ()
endif()
if (systemd_FOUND)
if(systemd_FOUND)
list(APPEND SPDLOG_UTESTS_SOURCES test_systemd.cpp)
endif ()
endif()
enable_testing()
@ -48,22 +48,22 @@ function(spdlog_prepare_test test_target spdlog_lib)
add_executable(${test_target} ${SPDLOG_UTESTS_SOURCES})
spdlog_enable_warnings(${test_target})
target_link_libraries(${test_target} PRIVATE ${spdlog_lib})
if (systemd_FOUND)
if(systemd_FOUND)
target_link_libraries(${test_target} PRIVATE ${systemd_LIBRARIES})
endif ()
if (SPDLOG_SANITIZE_ADDRESS)
endif()
if(SPDLOG_SANITIZE_ADDRESS)
spdlog_enable_sanitizer(${test_target})
endif ()
endif()
add_test(NAME ${test_target} COMMAND ${test_target})
set_tests_properties(${test_target} PROPERTIES RUN_SERIAL ON)
endfunction()
# The compiled library tests
if (SPDLOG_BUILD_TESTS OR SPDLOG_BUILD_ALL)
if(SPDLOG_BUILD_TESTS OR SPDLOG_BUILD_ALL)
spdlog_prepare_test(spdlog-utests spdlog::spdlog)
endif ()
endif()
# The header-only library version tests
if (SPDLOG_BUILD_TESTS_HO OR SPDLOG_BUILD_ALL)
if(SPDLOG_BUILD_TESTS_HO OR SPDLOG_BUILD_ALL)
spdlog_prepare_test(spdlog-utests-ho spdlog::spdlog_header_only)
endif ()
endif()