Formatted cmake using cmake-format

5 years ago · ff0e430e46
parent e86dc8c338
commit ff0e430e46
7 changed files with 285 additions and 303 deletions
--- a/CMakeLists.txt
+++ b/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.2)

@ -9,7 +8,7 @@ else()
  cmake_policy(VERSION 3.11)
 endif()

-ENABLE_LANGUAGE(C)
+enable_language(C)

 # ---------------------------------------------------------------------------------------
 # Start spdlog project
@ -31,7 +30,6 @@ if(NOT CMAKE_BUILD_TYPE)
  set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose Release or Debug" FORCE)
 endif()

-
 # ---------------------------------------------------------------------------------------
 # Compiler config
 # ---------------------------------------------------------------------------------------
@ -46,7 +44,6 @@ if(CMAKE_SYSTEM_NAME MATCHES "CYGWIN")
  set(CMAKE_CXX_EXTENSIONS ON)
 endif()

-
 # ---------------------------------------------------------------------------------------
 # Set SPDLOG_MASTER_PROJECT to ON if we are building spdlog
 # ---------------------------------------------------------------------------------------
@ -100,13 +97,17 @@ if(WIN32)
  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")
@ -124,13 +125,7 @@ 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)
@ -157,8 +152,7 @@ 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>"
+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)
@ -177,12 +171,10 @@ endif()
 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>"
+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
 # ---------------------------------------------------------------------------------------
@ -253,7 +245,6 @@ if(SPDLOG_NO_ATOMIC_LEVELS)
  target_compile_definitions(spdlog_header_only INTERFACE SPDLOG_NO_ATOMIC_LEVELS)
 endif()

-
 # ---------------------------------------------------------------------------------------
 # Build binaries
 # ---------------------------------------------------------------------------------------
@ -294,7 +285,9 @@ if (SPDLOG_INSTALL)
  # Include files
  # ---------------------------------------------------------------------------------------
  install(DIRECTORY include/ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" PATTERN "fmt/bundled" EXCLUDE)
-    install(TARGETS spdlog spdlog_header_only EXPORT spdlog
+  install(
+    TARGETS spdlog spdlog_header_only
+    EXPORT spdlog
    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
@ -316,22 +309,16 @@ if (SPDLOG_INSTALL)
  # ---------------------------------------------------------------------------------------
  # Install CMake config files
  # ---------------------------------------------------------------------------------------
-    install(EXPORT spdlog
-            DESTINATION ${export_dest_dir}
-            NAMESPACE spdlog::
-            FILE ${config_targets_file})
+  install(EXPORT spdlog DESTINATION ${export_dest_dir} NAMESPACE spdlog:: FILE ${config_targets_file})

  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}")
+  install(FILES "${project_config_out}" "${version_config_file}" DESTINATION "${export_dest_dir}")

  # ---------------------------------------------------------------------------------------
  # Support creation of installable packages
  # ---------------------------------------------------------------------------------------
  include(cmake/spdlogCPack.cmake)
 endif()
-
--- 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)
--- a/cmake/ide.cmake
+++ b/cmake/ide.cmake
@ -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})
-
--- 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")
@ -44,7 +39,8 @@ 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")
+  set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION
+      "${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig")
 endif()

 include(CPack)
--- a/cmake/utils.cmake
+++ b/cmake/utils.cmake
@ -25,7 +25,6 @@ function(spdlog_extract_version)
  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)
@ -36,15 +35,19 @@ function(spdlog_enable_warnings target_name)
      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>
+    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")
--- a/example/CMakeLists.txt
+++ b/example/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.2)
 project(spdlog_examples CXX)
@ -22,4 +21,3 @@ if(SPDLOG_BUILD_EXAMPLE_HO)
  add_executable(example_header_only example.cpp)
  target_link_libraries(example_header_only PRIVATE spdlog::spdlog_header_only)
 endif()
-
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@ -43,7 +43,6 @@ if(systemd_FOUND)
  list(APPEND SPDLOG_UTESTS_SOURCES test_systemd.cpp)
 endif()

-
 enable_testing()

 function(spdlog_prepare_test test_target spdlog_lib)