diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0693c508..f8d446db 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,19 +1,18 @@
-# Copyright(c) 2019 spdlog authors
-# Distributed under the MIT License (http://opensource.org/licenses/MIT)
+# Copyright(c) 2019 spdlog authors Distributed under the MIT License (http://opensource.org/licenses/MIT)
 
 cmake_minimum_required(VERSION 3.2)
 
 if(${CMAKE_VERSION} VERSION_LESS 3.11)
-    cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
+  cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
 else()
-    cmake_policy(VERSION 3.11)
+  cmake_policy(VERSION 3.11)
 endif()
 
-ENABLE_LANGUAGE(C)
+enable_language(C)
 
-#---------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------
 # Start spdlog project
-#---------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------
 include(cmake/utils.cmake)
 include(cmake/ide.cmake)
 
@@ -24,40 +23,38 @@ message(STATUS "Build spdlog: ${SPDLOG_VERSION}")
 
 include(GNUInstallDirs)
 
-#---------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------
 # Set default build to release
-#---------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------
 if(NOT CMAKE_BUILD_TYPE)
-    set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose Release or Debug" FORCE)
+  set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose Release or Debug" FORCE)
 endif()
 
-
-#---------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------
 # Compiler config
-#---------------------------------------------------------------------------------------
-if (NOT CMAKE_CXX_STANDARD)
-    set(CMAKE_CXX_STANDARD 11)
-    set(CMAKE_CXX_STANDARD_REQUIRED ON)
+# ---------------------------------------------------------------------------------------
+if(NOT CMAKE_CXX_STANDARD)
+  set(CMAKE_CXX_STANDARD 11)
+  set(CMAKE_CXX_STANDARD_REQUIRED ON)
 endif()
 
-set(CMAKE_CXX_EXTENSIONS  OFF)
+set(CMAKE_CXX_EXTENSIONS OFF)
 
 if(CMAKE_SYSTEM_NAME MATCHES "CYGWIN")
-    set(CMAKE_CXX_EXTENSIONS ON)
+  set(CMAKE_CXX_EXTENSIONS ON)
 endif()
 
-
-#---------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------
 # Set SPDLOG_MASTER_PROJECT to ON if we are building spdlog
-#---------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------
 # Check if spdlog is being used directly or via add_subdirectory, but allow overriding
-if (NOT DEFINED SPDLOG_MASTER_PROJECT)
-    if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
-        set(SPDLOG_MASTER_PROJECT ON)
-    else()
-        set(SPDLOG_MASTER_PROJECT OFF)
-    endif()
-endif ()
+if(NOT DEFINED SPDLOG_MASTER_PROJECT)
+  if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
+    set(SPDLOG_MASTER_PROJECT ON)
+  else()
+    set(SPDLOG_MASTER_PROJECT OFF)
+  endif()
+endif()
 
 option(SPDLOG_BUILD_ALL "Build all artifacts" OFF)
 
@@ -90,76 +87,73 @@ option(SPDLOG_FMT_EXTERNAL "Use external fmt library instead of bundled" OFF)
 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)
 
-if (SPDLOG_FMT_EXTERNAL AND SPDLOG_FMT_EXTERNAL_HO)
-    message(FATAL_ERROR "SPDLOG_FMT_EXTERNAL and SPDLOG_FMT_EXTERNAL_HO are mutually exclusive")
+if(SPDLOG_FMT_EXTERNAL AND SPDLOG_FMT_EXTERNAL_HO)
+  message(FATAL_ERROR "SPDLOG_FMT_EXTERNAL and SPDLOG_FMT_EXTERNAL_HO are mutually exclusive")
 endif()
 
 # misc tweakme options
 if(WIN32)
-    option(SPDLOG_WCHAR_SUPPORT "Support wchar api" OFF)
-    option(SPDLOG_WCHAR_FILENAMES "Support wchar filenames" OFF)
+  option(SPDLOG_WCHAR_SUPPORT "Support wchar api" OFF)
+  option(SPDLOG_WCHAR_FILENAMES "Support wchar filenames" OFF)
 endif()
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-    option(SPDLOG_CLOCK_COARSE "Use the much faster (but much less accurate) CLOCK_REALTIME_COARSE instead of the regular clock," OFF)
+  option(SPDLOG_CLOCK_COARSE
+         "Use the much faster (but much less accurate) CLOCK_REALTIME_COARSE instead of the regular clock," OFF)
 endif()
 
 option(SPDLOG_PREVENT_CHILD_FD "Prevent from child processes to inherit log file descriptors" OFF)
 option(SPDLOG_NO_THREAD_ID "prevent spdlog from querying the thread id on each log call if thread id is not needed" OFF)
 option(SPDLOG_NO_TLS "prevent spdlog from using thread local storage" OFF)
-option(SPDLOG_NO_ATOMIC_LEVELS "prevent spdlog from using of std::atomic log levels (use only if your code never modifies log levels concurrently" OFF)
+option(
+  SPDLOG_NO_ATOMIC_LEVELS
+  "prevent spdlog from using of std::atomic log levels (use only if your code never modifies log levels concurrently"
+  OFF)
 
 # clang-tidy
 if(${CMAKE_VERSION} VERSION_GREATER "3.5")
-    option(SPDLOG_TIDY "run clang-tidy" OFF)
+  option(SPDLOG_TIDY "run clang-tidy" OFF)
 endif()
 
 if(SPDLOG_TIDY)
-    set(CMAKE_CXX_CLANG_TIDY "clang-tidy")
-    set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-    message(STATUS "Enabled clang-tidy")
+  set(CMAKE_CXX_CLANG_TIDY "clang-tidy")
+  set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+  message(STATUS "Enabled clang-tidy")
 endif()
 
 find_package(Threads REQUIRED)
 message(STATUS "Build type: " ${CMAKE_BUILD_TYPE})
-#---------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------
 # Static/Shared library (shared not supported in windows yet)
-#---------------------------------------------------------------------------------------
-set(SPDLOG_SRCS
-        src/spdlog.cpp
-        src/stdout_sinks.cpp
-        src/color_sinks.cpp
-        src/file_sinks.cpp
-        src/async.cpp
-        src/cfg.cpp)
+# ---------------------------------------------------------------------------------------
+set(SPDLOG_SRCS src/spdlog.cpp src/stdout_sinks.cpp src/color_sinks.cpp src/file_sinks.cpp src/async.cpp src/cfg.cpp)
 
 if(NOT SPDLOG_FMT_EXTERNAL AND NOT SPDLOG_FMT_EXTERNAL_HO)
-    list(APPEND SPDLOG_SRCS src/fmt.cpp)
+  list(APPEND SPDLOG_SRCS src/fmt.cpp)
 endif()
 
 if(WIN32 AND SPDLOG_BUILD_SHARED)
-    list(APPEND SPDLOG_SRCS ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
+  list(APPEND SPDLOG_SRCS ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
 endif()
 
-if (SPDLOG_BUILD_SHARED)
-    add_library(spdlog SHARED ${SPDLOG_SRCS} ${SPDLOG_ALL_HEADERS})
-    target_compile_definitions(spdlog PUBLIC SPDLOG_SHARED_LIB)
-    if(WIN32)
-        target_compile_options(spdlog PUBLIC /wd4251 /wd4275)
-        configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/version.rc.in ${CMAKE_CURRENT_BINARY_DIR}/version.rc @ONLY)
-    endif()
-    if(NOT SPDLOG_FMT_EXTERNAL AND NOT SPDLOG_FMT_EXTERNAL_HO)
-        target_compile_definitions(spdlog PRIVATE FMT_EXPORT PUBLIC FMT_SHARED)
-    endif()
+if(SPDLOG_BUILD_SHARED)
+  add_library(spdlog SHARED ${SPDLOG_SRCS} ${SPDLOG_ALL_HEADERS})
+  target_compile_definitions(spdlog PUBLIC SPDLOG_SHARED_LIB)
+  if(WIN32)
+    target_compile_options(spdlog PUBLIC /wd4251 /wd4275)
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/version.rc.in ${CMAKE_CURRENT_BINARY_DIR}/version.rc @ONLY)
+  endif()
+  if(NOT SPDLOG_FMT_EXTERNAL AND NOT SPDLOG_FMT_EXTERNAL_HO)
+    target_compile_definitions(spdlog PRIVATE FMT_EXPORT PUBLIC FMT_SHARED)
+  endif()
 else()
-    add_library(spdlog STATIC ${SPDLOG_SRCS} ${SPDLOG_ALL_HEADERS})
+  add_library(spdlog STATIC ${SPDLOG_SRCS} ${SPDLOG_ALL_HEADERS})
 endif()
 
 add_library(spdlog::spdlog ALIAS spdlog)
 
 target_compile_definitions(spdlog PUBLIC SPDLOG_COMPILED_LIB)
-target_include_directories(spdlog PUBLIC
-        "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
-        "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
+target_include_directories(spdlog PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
+                                         "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
 target_link_libraries(spdlog PUBLIC Threads::Threads)
 spdlog_enable_warnings(spdlog)
 
@@ -167,171 +161,164 @@ set_target_properties(spdlog PROPERTIES VERSION ${SPDLOG_VERSION} SOVERSION ${SP
 set_target_properties(spdlog PROPERTIES DEBUG_POSTFIX d)
 
 if(COMMAND target_precompile_headers AND SPDLOG_ENABLE_PCH)
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/pch.h.in ${PROJECT_BINARY_DIR}/spdlog_pch.h @ONLY)
-    target_precompile_headers(spdlog PRIVATE ${PROJECT_BINARY_DIR}/spdlog_pch.h)
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/pch.h.in ${PROJECT_BINARY_DIR}/spdlog_pch.h @ONLY)
+  target_precompile_headers(spdlog PRIVATE ${PROJECT_BINARY_DIR}/spdlog_pch.h)
 endif()
 
-#---------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------
 # Header only version
-#---------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------
 add_library(spdlog_header_only INTERFACE)
 add_library(spdlog::spdlog_header_only ALIAS spdlog_header_only)
 
-target_include_directories(spdlog_header_only INTERFACE
-        "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
-        "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
+target_include_directories(spdlog_header_only INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
+                                                        "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
 target_link_libraries(spdlog_header_only INTERFACE Threads::Threads)
 
-
-#---------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------
 # Use fmt package if using external fmt
-#---------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------
 if(SPDLOG_FMT_EXTERNAL OR SPDLOG_FMT_EXTERNAL_HO)
-    if (NOT TARGET fmt::fmt)
-        find_package(fmt 5.3.0 REQUIRED)
-    endif ()
-    target_compile_definitions(spdlog PUBLIC SPDLOG_FMT_EXTERNAL)
-    target_compile_definitions(spdlog_header_only INTERFACE SPDLOG_FMT_EXTERNAL)
+  if(NOT TARGET fmt::fmt)
+    find_package(fmt 5.3.0 REQUIRED)
+  endif()
+  target_compile_definitions(spdlog PUBLIC SPDLOG_FMT_EXTERNAL)
+  target_compile_definitions(spdlog_header_only INTERFACE SPDLOG_FMT_EXTERNAL)
 
-    # use external fmt-header-nly
-    if(SPDLOG_FMT_EXTERNAL_HO)
-        target_link_libraries(spdlog PUBLIC fmt::fmt-header-only)
-        target_link_libraries(spdlog_header_only INTERFACE fmt::fmt-header-only)
-    else() # use external compile fmt
-        target_link_libraries(spdlog PUBLIC fmt::fmt)
-        target_link_libraries(spdlog_header_only INTERFACE fmt::fmt)
-    endif()
+  # use external fmt-header-nly
+  if(SPDLOG_FMT_EXTERNAL_HO)
+    target_link_libraries(spdlog PUBLIC fmt::fmt-header-only)
+    target_link_libraries(spdlog_header_only INTERFACE fmt::fmt-header-only)
+  else() # use external compile fmt
+    target_link_libraries(spdlog PUBLIC fmt::fmt)
+    target_link_libraries(spdlog_header_only INTERFACE fmt::fmt)
+  endif()
 
-    set(PKG_CONFIG_REQUIRES fmt) # add dependency to pkg-config
+  set(PKG_CONFIG_REQUIRES fmt) # add dependency to pkg-config
 endif()
 
-#---------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------
 # Misc definitions according to tweak options
-#---------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------
 if(SPDLOG_WCHAR_SUPPORT)
-    target_compile_definitions(spdlog PUBLIC SPDLOG_WCHAR_TO_UTF8_SUPPORT)
-    target_compile_definitions(spdlog_header_only INTERFACE SPDLOG_WCHAR_TO_UTF8_SUPPORT)
- endif()
+  target_compile_definitions(spdlog PUBLIC SPDLOG_WCHAR_TO_UTF8_SUPPORT)
+  target_compile_definitions(spdlog_header_only INTERFACE SPDLOG_WCHAR_TO_UTF8_SUPPORT)
+endif()
 
- if(SPDLOG_WCHAR_FILENAMES)
-    target_compile_definitions(spdlog PUBLIC SPDLOG_WCHAR_FILENAMES)
-    target_compile_definitions(spdlog_header_only INTERFACE SPDLOG_WCHAR_FILENAMES)
- endif()
+if(SPDLOG_WCHAR_FILENAMES)
+  target_compile_definitions(spdlog PUBLIC SPDLOG_WCHAR_FILENAMES)
+  target_compile_definitions(spdlog_header_only INTERFACE SPDLOG_WCHAR_FILENAMES)
+endif()
 
- if(SPDLOG_NO_EXCEPTIONS)
-    target_compile_definitions(spdlog PUBLIC SPDLOG_NO_EXCEPTIONS)
+if(SPDLOG_NO_EXCEPTIONS)
+  target_compile_definitions(spdlog PUBLIC SPDLOG_NO_EXCEPTIONS)
 
-    target_compile_definitions(spdlog_header_only INTERFACE SPDLOG_NO_EXCEPTIONS)
+  target_compile_definitions(spdlog_header_only INTERFACE SPDLOG_NO_EXCEPTIONS)
 
-    if(NOT MSVC)
-        target_compile_options(spdlog PRIVATE -fno-exceptions)
-    endif()
+  if(NOT MSVC)
+    target_compile_options(spdlog PRIVATE -fno-exceptions)
+  endif()
 endif()
 
 if(SPDLOG_CLOCK_COARSE)
-    target_compile_definitions(spdlog PRIVATE SPDLOG_CLOCK_COARSE)
-    target_compile_definitions(spdlog_header_only INTERFACE SPDLOG_CLOCK_COARSE)
+  target_compile_definitions(spdlog PRIVATE SPDLOG_CLOCK_COARSE)
+  target_compile_definitions(spdlog_header_only INTERFACE SPDLOG_CLOCK_COARSE)
 endif()
 
 if(SPDLOG_PREVENT_CHILD_FD)
-    target_compile_definitions(spdlog PRIVATE SPDLOG_PREVENT_CHILD_FD)
-    target_compile_definitions(spdlog_header_only INTERFACE SPDLOG_PREVENT_CHILD_FD)
+  target_compile_definitions(spdlog PRIVATE SPDLOG_PREVENT_CHILD_FD)
+  target_compile_definitions(spdlog_header_only INTERFACE SPDLOG_PREVENT_CHILD_FD)
 endif()
 
 if(SPDLOG_NO_THREAD_ID)
-    target_compile_definitions(spdlog PRIVATE SPDLOG_NO_THREAD_ID)
-    target_compile_definitions(spdlog_header_only INTERFACE SPDLOG_NO_THREAD_ID)
+  target_compile_definitions(spdlog PRIVATE SPDLOG_NO_THREAD_ID)
+  target_compile_definitions(spdlog_header_only INTERFACE SPDLOG_NO_THREAD_ID)
 endif()
 
 if(SPDLOG_NO_TLS)
-    target_compile_definitions(spdlog PRIVATE SPDLOG_NO_TLS)
-    target_compile_definitions(spdlog_header_only INTERFACE SPDLOG_NO_TLS)
+  target_compile_definitions(spdlog PRIVATE SPDLOG_NO_TLS)
+  target_compile_definitions(spdlog_header_only INTERFACE SPDLOG_NO_TLS)
 endif()
 
 if(SPDLOG_NO_ATOMIC_LEVELS)
-    target_compile_definitions(spdlog PUBLIC SPDLOG_NO_ATOMIC_LEVELS)
-    target_compile_definitions(spdlog_header_only INTERFACE SPDLOG_NO_ATOMIC_LEVELS)
+  target_compile_definitions(spdlog PUBLIC SPDLOG_NO_ATOMIC_LEVELS)
+  target_compile_definitions(spdlog_header_only INTERFACE SPDLOG_NO_ATOMIC_LEVELS)
 endif()
 
-
-#---------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------
 # Build binaries
-#---------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------
 if(SPDLOG_BUILD_EXAMPLE OR SPDLOG_BUILD_EXAMPLE_HO OR SPDLOG_BUILD_ALL)
-    message(STATUS "Generating example(s)")
-    add_subdirectory(example)
-    spdlog_enable_warnings(example)
-    if(SPDLOG_BUILD_EXAMPLE_HO)
-        spdlog_enable_warnings(example_header_only)
-    endif()
+  message(STATUS "Generating example(s)")
+  add_subdirectory(example)
+  spdlog_enable_warnings(example)
+  if(SPDLOG_BUILD_EXAMPLE_HO)
+    spdlog_enable_warnings(example_header_only)
+  endif()
 endif()
 
 if(SPDLOG_BUILD_TESTS OR SPDLOG_BUILD_TESTS_HO OR SPDLOG_BUILD_ALL)
-    message(STATUS "Generating tests")
-    enable_testing()
-    add_subdirectory(tests)
+  message(STATUS "Generating tests")
+  enable_testing()
+  add_subdirectory(tests)
 endif()
 
 if(SPDLOG_BUILD_BENCH OR SPDLOG_BUILD_ALL)
-    message(STATUS "Generating benchmarks")
-    add_subdirectory(bench)
+  message(STATUS "Generating benchmarks")
+  add_subdirectory(bench)
 endif()
 
-#---------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------
 # Install
-#---------------------------------------------------------------------------------------
-if (SPDLOG_INSTALL)
-    message(STATUS "Generating install")
-    set(project_config_in "${CMAKE_CURRENT_LIST_DIR}/cmake/spdlogConfig.cmake.in")
-    set(project_config_out "${CMAKE_CURRENT_BINARY_DIR}/spdlogConfig.cmake")
-    set(config_targets_file "spdlogConfigTargets.cmake")
-    set(version_config_file "${CMAKE_CURRENT_BINARY_DIR}/spdlogConfigVersion.cmake")
-    set(export_dest_dir "${CMAKE_INSTALL_LIBDIR}/cmake/spdlog")
-    set(pkgconfig_install_dir "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
-    set(pkg_config "${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc")
+# ---------------------------------------------------------------------------------------
+if(SPDLOG_INSTALL)
+  message(STATUS "Generating install")
+  set(project_config_in "${CMAKE_CURRENT_LIST_DIR}/cmake/spdlogConfig.cmake.in")
+  set(project_config_out "${CMAKE_CURRENT_BINARY_DIR}/spdlogConfig.cmake")
+  set(config_targets_file "spdlogConfigTargets.cmake")
+  set(version_config_file "${CMAKE_CURRENT_BINARY_DIR}/spdlogConfigVersion.cmake")
+  set(export_dest_dir "${CMAKE_INSTALL_LIBDIR}/cmake/spdlog")
+  set(pkgconfig_install_dir "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+  set(pkg_config "${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc")
 
-    #---------------------------------------------------------------------------------------
-    # Include files
-    #---------------------------------------------------------------------------------------
-    install(DIRECTORY include/ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" PATTERN "fmt/bundled" EXCLUDE)
-    install(TARGETS spdlog spdlog_header_only EXPORT spdlog
-        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+  # ---------------------------------------------------------------------------------------
+  # Include files
+  # ---------------------------------------------------------------------------------------
+  install(DIRECTORY include/ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" PATTERN "fmt/bundled" EXCLUDE)
+  install(
+    TARGETS spdlog spdlog_header_only
+    EXPORT spdlog
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 
-    if(NOT SPDLOG_FMT_EXTERNAL AND NOT SPDLOG_FMT_EXTERNAL_HO)
-        install(DIRECTORY include/${PROJECT_NAME}/fmt/bundled/
-                DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/fmt/bundled/")
-    endif()
+  if(NOT SPDLOG_FMT_EXTERNAL AND NOT SPDLOG_FMT_EXTERNAL_HO)
+    install(DIRECTORY include/${PROJECT_NAME}/fmt/bundled/
+            DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/fmt/bundled/")
+  endif()
 
-    #---------------------------------------------------------------------------------------
-    # Install pkg-config file
-    #---------------------------------------------------------------------------------------
-    get_target_property(PKG_CONFIG_DEFINES spdlog INTERFACE_COMPILE_DEFINITIONS)
-    string(REPLACE ";" " -D" PKG_CONFIG_DEFINES "${PKG_CONFIG_DEFINES}")
-    string(CONCAT PKG_CONFIG_DEFINES "-D" "${PKG_CONFIG_DEFINES}")
-    configure_file("cmake/${PROJECT_NAME}.pc.in" "${pkg_config}" @ONLY)
-    install(FILES "${pkg_config}" DESTINATION "${pkgconfig_install_dir}")
+  # ---------------------------------------------------------------------------------------
+  # Install pkg-config file
+  # ---------------------------------------------------------------------------------------
+  get_target_property(PKG_CONFIG_DEFINES spdlog INTERFACE_COMPILE_DEFINITIONS)
+  string(REPLACE ";" " -D" PKG_CONFIG_DEFINES "${PKG_CONFIG_DEFINES}")
+  string(CONCAT PKG_CONFIG_DEFINES "-D" "${PKG_CONFIG_DEFINES}")
+  configure_file("cmake/${PROJECT_NAME}.pc.in" "${pkg_config}" @ONLY)
+  install(FILES "${pkg_config}" DESTINATION "${pkgconfig_install_dir}")
 
-    #---------------------------------------------------------------------------------------
-    # Install CMake config files
-    #---------------------------------------------------------------------------------------
-    install(EXPORT spdlog
-            DESTINATION ${export_dest_dir}
-            NAMESPACE spdlog::
-            FILE ${config_targets_file})
+  # ---------------------------------------------------------------------------------------
+  # Install CMake config files
+  # ---------------------------------------------------------------------------------------
+  install(EXPORT spdlog DESTINATION ${export_dest_dir} NAMESPACE spdlog:: FILE ${config_targets_file})
 
-    include(CMakePackageConfigHelpers)
-    configure_file("${project_config_in}" "${project_config_out}" @ONLY)
+  include(CMakePackageConfigHelpers)
+  configure_file("${project_config_in}" "${project_config_out}" @ONLY)
 
-    write_basic_package_version_file("${version_config_file}" COMPATIBILITY SameMajorVersion)
-    install(FILES
-            "${project_config_out}"
-            "${version_config_file}" DESTINATION "${export_dest_dir}")
-
-    #---------------------------------------------------------------------------------------
-    # Support creation of installable packages
-    #---------------------------------------------------------------------------------------
-    include(cmake/spdlogCPack.cmake)
-endif ()
+  write_basic_package_version_file("${version_config_file}" COMPATIBILITY SameMajorVersion)
+  install(FILES "${project_config_out}" "${version_config_file}" DESTINATION "${export_dest_dir}")
 
+  # ---------------------------------------------------------------------------------------
+  # Support creation of installable packages
+  # ---------------------------------------------------------------------------------------
+  include(cmake/spdlogCPack.cmake)
+endif()
diff --git a/bench/CMakeLists.txt b/bench/CMakeLists.txt
index 0ea88423..c1e068b2 100644
--- a/bench/CMakeLists.txt
+++ b/bench/CMakeLists.txt
@@ -1,5 +1,4 @@
-# Copyright(c) 2019 spdlog authors
-# Distributed under the MIT License (http://opensource.org/licenses/MIT)
+# Copyright(c) 2019 spdlog authors Distributed under the MIT License (http://opensource.org/licenses/MIT)
 
 cmake_minimum_required(VERSION 3.1)
 project(spdlog_bench CXX)
diff --git a/cmake/ide.cmake b/cmake/ide.cmake
index 27472c38..a0656a5e 100644
--- a/cmake/ide.cmake
+++ b/cmake/ide.cmake
@@ -1,6 +1,6 @@
-#---------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------
 # IDE support for headers
-#---------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------
 set(SPDLOG_HEADERS_DIR "${CMAKE_CURRENT_LIST_DIR}/../include")
 
 file(GLOB SPDLOG_TOP_HEADERS "${SPDLOG_HEADERS_DIR}/spdlog/*.h")
@@ -8,11 +8,11 @@ file(GLOB SPDLOG_DETAILS_HEADERS "${SPDLOG_HEADERS_DIR}/spdlog/details/*.h")
 file(GLOB SPDLOG_SINKS_HEADERS "${SPDLOG_HEADERS_DIR}/spdlog/sinks/*.h")
 file(GLOB SPDLOG_FMT_HEADERS "${SPDLOG_HEADERS_DIR}/spdlog/fmt/*.h")
 file(GLOB SPDLOG_FMT_BUNDELED_HEADERS "${SPDLOG_HEADERS_DIR}/spdlog/fmt/bundled/*.h")
-set(SPDLOG_ALL_HEADERS ${SPDLOG_TOP_HEADERS} ${SPDLOG_DETAILS_HEADERS} ${SPDLOG_SINKS_HEADERS} ${SPDLOG_FMT_HEADERS} ${SPDLOG_FMT_BUNDELED_HEADERS})
+set(SPDLOG_ALL_HEADERS ${SPDLOG_TOP_HEADERS} ${SPDLOG_DETAILS_HEADERS} ${SPDLOG_SINKS_HEADERS} ${SPDLOG_FMT_HEADERS}
+                       ${SPDLOG_FMT_BUNDELED_HEADERS})
 
 source_group("Header Files\\spdlog" FILES ${SPDLOG_TOP_HEADERS})
 source_group("Header Files\\spdlog\\details" FILES ${SPDLOG_DETAILS_HEADERS})
 source_group("Header Files\\spdlog\\sinks" FILES ${SPDLOG_SINKS_HEADERS})
 source_group("Header Files\\spdlog\\fmt" FILES ${SPDLOG_FMT_HEADERS})
 source_group("Header Files\\spdlog\\fmt\\bundled\\" FILES ${SPDLOG_FMT_BUNDELED_HEADERS})
-
diff --git a/cmake/spdlogCPack.cmake b/cmake/spdlogCPack.cmake
index 471a7ea3..3eee6a33 100644
--- a/cmake/spdlogCPack.cmake
+++ b/cmake/spdlogCPack.cmake
@@ -1,12 +1,7 @@
 set(CPACK_GENERATOR "TGZ;ZIP" CACHE STRING "Semicolon separated list of generators")
 
 set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 0)
-set(CPACK_INSTALL_CMAKE_PROJECTS
-    "${CMAKE_BINARY_DIR}"
-    "${PROJECT_NAME}"
-    ALL
-    .
-    )
+set(CPACK_INSTALL_CMAKE_PROJECTS "${CMAKE_BINARY_DIR}" "${PROJECT_NAME}" ALL .)
 
 set(CPACK_PROJECT_URL "https://github.com/gabime/spdlog")
 set(CPACK_PACKAGE_VENDOR "Gabi Melman")
@@ -16,9 +11,9 @@ set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
 set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR})
 set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH})
 set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
-if (PROJECT_VERSION_TWEAK)
-    set(CPACK_PACKAGE_VERSION ${CPACK_PACKAGE_VERSION}.${PROJECT_VERSION_TWEAK})
-endif ()
+if(PROJECT_VERSION_TWEAK)
+  set(CPACK_PACKAGE_VERSION ${CPACK_PACKAGE_VERSION}.${PROJECT_VERSION_TWEAK})
+endif()
 set(CPACK_PACKAGE_RELOCATABLE ON CACHE BOOL "Build relocatable package")
 
 set(CPACK_RPM_PACKAGE_LICENSE "MIT")
@@ -26,25 +21,26 @@ set(CPACK_RPM_PACKAGE_GROUP "Development/Libraries")
 set(CPACK_RPM_PACKAGE_URL ${CPACK_PROJECT_URL})
 set(CPACK_RPM_PACKAGE_DESCRIPTION "Very fast, header-only/compiled, C++ logging library.")
 
-if (CPACK_PACKAGE_NAME)
-    set(CPACK_RPM_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
+if(CPACK_PACKAGE_NAME)
+  set(CPACK_RPM_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
 else()
-    set(CPACK_RPM_FILE_NAME "${PROJECT_NAME}-${CPACK_PACKAGE_VERSION}")
+  set(CPACK_RPM_FILE_NAME "${PROJECT_NAME}-${CPACK_PACKAGE_VERSION}")
 endif()
 
-if (CPACK_RPM_PACKAGE_RELEASE)
-    set(CPACK_RPM_FILE_NAME "${CPACK_RPM_FILE_NAME}-${CPACK_RPM_PACKAGE_RELEASE}")
-endif ()
+if(CPACK_RPM_PACKAGE_RELEASE)
+  set(CPACK_RPM_FILE_NAME "${CPACK_RPM_FILE_NAME}-${CPACK_RPM_PACKAGE_RELEASE}")
+endif()
 
-if (CPACK_RPM_PACKAGE_ARCHITECTURE)
-    set(CPACK_RPM_FILE_NAME "${CPACK_RPM_FILE_NAME}.${CPACK_RPM_PACKAGE_ARCHITECTURE}")
-endif ()
+if(CPACK_RPM_PACKAGE_ARCHITECTURE)
+  set(CPACK_RPM_FILE_NAME "${CPACK_RPM_FILE_NAME}.${CPACK_RPM_PACKAGE_ARCHITECTURE}")
+endif()
 set(CPACK_RPM_FILE_NAME "${CPACK_RPM_FILE_NAME}.rpm")
 
-if (NOT CPACK_PACKAGE_RELOCATABLE)
-    # Depend on pkgconfig rpm to create the system pkgconfig folder
-    set(CPACK_RPM_PACKAGE_REQUIRES pkgconfig)
-    set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig")
-endif ()
+if(NOT CPACK_PACKAGE_RELOCATABLE)
+  # Depend on pkgconfig rpm to create the system pkgconfig folder
+  set(CPACK_RPM_PACKAGE_REQUIRES pkgconfig)
+  set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION
+      "${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+endif()
 
 include(CPack)
diff --git a/cmake/utils.cmake b/cmake/utils.cmake
index 30d678da..a823a47f 100644
--- a/cmake/utils.cmake
+++ b/cmake/utils.cmake
@@ -1,59 +1,62 @@
-# Get spdlog version from include/spdlog/version.h and put it in SPDLOG_VERSION
-function(spdlog_extract_version)
-    file(READ "${CMAKE_CURRENT_LIST_DIR}/include/spdlog/version.h" file_contents)
-    string(REGEX MATCH "SPDLOG_VER_MAJOR ([0-9]+)" _  "${file_contents}")
-    if(NOT CMAKE_MATCH_COUNT EQUAL 1)
-        message(FATAL_ERROR "Could not extract major version number from spdlog/version.h")
-    endif()
-    set(ver_major ${CMAKE_MATCH_1})
-
-    string(REGEX MATCH "SPDLOG_VER_MINOR ([0-9]+)" _  "${file_contents}")
-    if(NOT CMAKE_MATCH_COUNT EQUAL 1)
-        message(FATAL_ERROR "Could not extract minor version number from spdlog/version.h")
-    endif()
-
-    set(ver_minor ${CMAKE_MATCH_1})
-    string(REGEX MATCH "SPDLOG_VER_PATCH ([0-9]+)" _  "${file_contents}")
-    if(NOT CMAKE_MATCH_COUNT EQUAL 1)
-        message(FATAL_ERROR "Could not extract patch version number from spdlog/version.h")
-    endif()
-    set(ver_patch ${CMAKE_MATCH_1})
-
-    set(SPDLOG_VERSION_MAJOR ${ver_major} PARENT_SCOPE)
-    set(SPDLOG_VERSION_MINOR ${ver_minor} PARENT_SCOPE)
-    set(SPDLOG_VERSION_PATCH ${ver_patch} PARENT_SCOPE)
-    set (SPDLOG_VERSION "${ver_major}.${ver_minor}.${ver_patch}" PARENT_SCOPE)
-endfunction()
-
-
-# Turn on warnings on the given target
-function(spdlog_enable_warnings target_name)
-    if(SPDLOG_BUILD_WARNINGS)
-        if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-            list(APPEND MSVC_OPTIONS "/W3")
-            if(MSVC_VERSION GREATER  1900)  #Allow non fatal security warnings for msvc 2015
-                list(APPEND MSVC_OPTIONS "/WX")
-            endif()
-        endif()
-
-        target_compile_options(${target_name} PRIVATE
-            $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>,$<CXX_COMPILER_ID:GNU>>:
-                -Wall -Wextra -Wconversion -pedantic -Wfatal-errors>
-            $<$<CXX_COMPILER_ID:MSVC>:${MSVC_OPTIONS}>)
-    endif()
-
-endfunction()
-
-
-# Enable address sanitizer (gcc/clang only)
-function(spdlog_enable_sanitizer target_name)
-    if (NOT CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
-        message(FATAL_ERROR "Sanitizer supported only for gcc/clang")
-    endif()
-    message(STATUS "Address sanitizer enabled")
-    target_compile_options(${target_name} PRIVATE -fsanitize=address,undefined)
-    target_compile_options(${target_name} PRIVATE -fno-sanitize=signed-integer-overflow)
-    target_compile_options(${target_name} PRIVATE -fno-sanitize-recover=all)
-    target_compile_options(${target_name} PRIVATE -fno-omit-frame-pointer)
-    target_link_libraries(${target_name} PRIVATE -fsanitize=address,undefined -fuse-ld=gold)
-endfunction()
+# Get spdlog version from include/spdlog/version.h and put it in SPDLOG_VERSION
+function(spdlog_extract_version)
+  file(READ "${CMAKE_CURRENT_LIST_DIR}/include/spdlog/version.h" file_contents)
+  string(REGEX MATCH "SPDLOG_VER_MAJOR ([0-9]+)" _ "${file_contents}")
+  if(NOT CMAKE_MATCH_COUNT EQUAL 1)
+    message(FATAL_ERROR "Could not extract major version number from spdlog/version.h")
+  endif()
+  set(ver_major ${CMAKE_MATCH_1})
+
+  string(REGEX MATCH "SPDLOG_VER_MINOR ([0-9]+)" _ "${file_contents}")
+  if(NOT CMAKE_MATCH_COUNT EQUAL 1)
+    message(FATAL_ERROR "Could not extract minor version number from spdlog/version.h")
+  endif()
+
+  set(ver_minor ${CMAKE_MATCH_1})
+  string(REGEX MATCH "SPDLOG_VER_PATCH ([0-9]+)" _ "${file_contents}")
+  if(NOT CMAKE_MATCH_COUNT EQUAL 1)
+    message(FATAL_ERROR "Could not extract patch version number from spdlog/version.h")
+  endif()
+  set(ver_patch ${CMAKE_MATCH_1})
+
+  set(SPDLOG_VERSION_MAJOR ${ver_major} PARENT_SCOPE)
+  set(SPDLOG_VERSION_MINOR ${ver_minor} PARENT_SCOPE)
+  set(SPDLOG_VERSION_PATCH ${ver_patch} PARENT_SCOPE)
+  set(SPDLOG_VERSION "${ver_major}.${ver_minor}.${ver_patch}" PARENT_SCOPE)
+endfunction()
+
+# Turn on warnings on the given target
+function(spdlog_enable_warnings target_name)
+  if(SPDLOG_BUILD_WARNINGS)
+    if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+      list(APPEND MSVC_OPTIONS "/W3")
+      if(MSVC_VERSION GREATER 1900) # Allow non fatal security warnings for msvc 2015
+        list(APPEND MSVC_OPTIONS "/WX")
+      endif()
+    endif()
+
+    target_compile_options(
+      ${target_name}
+      PRIVATE $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>,$<CXX_COMPILER_ID:GNU>>:
+              -Wall
+              -Wextra
+              -Wconversion
+              -pedantic
+              -Wfatal-errors>
+              $<$<CXX_COMPILER_ID:MSVC>:${MSVC_OPTIONS}>)
+  endif()
+
+endfunction()
+
+# Enable address sanitizer (gcc/clang only)
+function(spdlog_enable_sanitizer target_name)
+  if(NOT CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
+    message(FATAL_ERROR "Sanitizer supported only for gcc/clang")
+  endif()
+  message(STATUS "Address sanitizer enabled")
+  target_compile_options(${target_name} PRIVATE -fsanitize=address,undefined)
+  target_compile_options(${target_name} PRIVATE -fno-sanitize=signed-integer-overflow)
+  target_compile_options(${target_name} PRIVATE -fno-sanitize-recover=all)
+  target_compile_options(${target_name} PRIVATE -fno-omit-frame-pointer)
+  target_link_libraries(${target_name} PRIVATE -fsanitize=address,undefined -fuse-ld=gold)
+endfunction()
diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt
index 36b2ad33..0888b850 100644
--- a/example/CMakeLists.txt
+++ b/example/CMakeLists.txt
@@ -1,25 +1,23 @@
-# Copyright(c) 2019 spdlog authors
-# Distributed under the MIT License (http://opensource.org/licenses/MIT)
+# Copyright(c) 2019 spdlog authors Distributed under the MIT License (http://opensource.org/licenses/MIT)
 
 cmake_minimum_required(VERSION 3.2)
 project(spdlog_examples CXX)
 
 if(NOT TARGET spdlog)
-    # Stand-alone build
-    find_package(spdlog REQUIRED)
+  # Stand-alone build
+  find_package(spdlog REQUIRED)
 endif()
 
-#---------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------
 # Example of using pre-compiled library
-#---------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------
 add_executable(example example.cpp)
 target_link_libraries(example PRIVATE spdlog::spdlog)
 
-#---------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------
 # Example of using header-only library
-#---------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------
 if(SPDLOG_BUILD_EXAMPLE_HO)
-    add_executable(example_header_only example.cpp)
-    target_link_libraries(example_header_only PRIVATE spdlog::spdlog_header_only)
+  add_executable(example_header_only example.cpp)
+  target_link_libraries(example_header_only PRIVATE spdlog::spdlog_header_only)
 endif()
-
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 0ca05f81..abb50b49 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -3,15 +3,15 @@ cmake_minimum_required(VERSION 3.2)
 project(spdlog_utests CXX)
 
 if(NOT TARGET spdlog)
-    # Stand-alone build
-    find_package(spdlog REQUIRED)
+  # Stand-alone build
+  find_package(spdlog REQUIRED)
 endif()
 
 include(../cmake/utils.cmake)
 
 find_package(PkgConfig)
 if(PkgConfig_FOUND)
-    pkg_check_modules(systemd libsystemd)
+  pkg_check_modules(systemd libsystemd)
 endif()
 
 set(SPDLOG_UTESTS_SOURCES
@@ -36,36 +36,35 @@ set(SPDLOG_UTESTS_SOURCES
     test_time_point.cpp)
 
 if(NOT SPDLOG_NO_EXCEPTIONS)
-    list(APPEND SPDLOG_UTESTS_SOURCES test_errors.cpp)
+  list(APPEND SPDLOG_UTESTS_SOURCES test_errors.cpp)
 endif()
 
 if(systemd_FOUND)
-    list(APPEND SPDLOG_UTESTS_SOURCES test_systemd.cpp)
+  list(APPEND SPDLOG_UTESTS_SOURCES test_systemd.cpp)
 endif()
 
-
 enable_testing()
 
 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)
-        target_link_libraries(${test_target} PRIVATE ${systemd_LIBRARIES})
-    endif()
-    if(SPDLOG_SANITIZE_ADDRESS)
-        spdlog_enable_sanitizer(${test_target})
-    endif()
-    add_test(NAME ${test_target} COMMAND ${test_target})
-    set_tests_properties(${test_target} PROPERTIES RUN_SERIAL ON)
+  add_executable(${test_target} ${SPDLOG_UTESTS_SOURCES})
+  spdlog_enable_warnings(${test_target})
+  target_link_libraries(${test_target} PRIVATE ${spdlog_lib})
+  if(systemd_FOUND)
+    target_link_libraries(${test_target} PRIVATE ${systemd_LIBRARIES})
+  endif()
+  if(SPDLOG_SANITIZE_ADDRESS)
+    spdlog_enable_sanitizer(${test_target})
+  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)
-    spdlog_prepare_test(spdlog-utests spdlog::spdlog)
+  spdlog_prepare_test(spdlog-utests spdlog::spdlog)
 endif()
 
 # The header-only library version tests
 if(SPDLOG_BUILD_TESTS_HO OR SPDLOG_BUILD_ALL)
-    spdlog_prepare_test(spdlog-utests-ho spdlog::spdlog_header_only)
+  spdlog_prepare_test(spdlog-utests-ho spdlog::spdlog_header_only)
 endif()