Форматирование кода

CMLibCodeAnalysisClangAnalyze.cmake

@@ -1,9 +1,4 @@
-find_program(
+find_program(CLANG_CHECK_EXE NAMES clang-check-10 clang-check-9 clang-check)
-  CLANG_CHECK_EXE
-  NAMES
-    clang-check-10
-    clang-check-9
-    clang-check)
 if(CLANG_CHECK_EXE)
   option(CMLIB_CLANG_ANALYZE_FIX "Perform fixes for Clang-Check" OFF)
 endif()

CMLibCodeAnalysisClangTidy.cmake

@@ -1,9 +1,4 @@
-find_program(
+find_program(CLANG_TIDY_EXE NAMES clang-tidy-10 clang-tidy-9 clang-tidy)
-  CLANG_TIDY_EXE
-  NAMES
-    clang-tidy-10
-    clang-tidy-9
-    clang-tidy)
 if(CLANG_TIDY_EXE)
   option(CMLIB_CLANG_TIDY_FIX "Perform fixes for Clang-Tidy" OFF)
 endif()

CMLibCodeAnalysisClazy.cmake

@@ -1,9 +1,5 @@
-find_program(
+find_program(CLANG_APPLY_REPLACEMENTS_EXE NAMES clang-apply-replacements-10 clang-apply-replacements-9
-  CLANG_APPLY_REPLACEMENTS_EXE
+                                                clang-apply-replacements)
-  NAMES
-    clang-apply-replacements-10
-    clang-apply-replacements-9
-    clang-apply-replacements)
 
 find_program(CLAZY_EXE NAMES clazy-standalone)
 
@@ -20,21 +16,26 @@ function(add_clazy_check target)
 
   set(_sources ${_CLAZY_UNPARSED_ARGUMENTS})
   if(NOT _CLAZY_CHECKS)
-    set(_CLAZY_CHECKS "level2,container-inside-loop,heap-allocated-small-trivial-type,inefficient-qlist,isempty-vs-count,qt-keywords,unneeded-cast")
+    set(_CLAZY_CHECKS
+        "level2,container-inside-loop,heap-allocated-small-trivial-type,inefficient-qlist,isempty-vs-count,qt-keywords,unneeded-cast"
+    )
   endif()
-  set(_args -checks=${_CLAZY_CHECKS} -extra-arg="-Wno-unknown-warning-option" -export-fixes=clazy-fixes-file.yaml)
+  set(_args -checks=${_CLAZY_CHECKS} -extra-arg="-Wno-unknown-warning-option"
+            -export-fixes=clazy-fixes-file.yaml)
 
   if(CLAZY_EXE)
     if(NOT TARGET clazy-check)
       add_custom_target(clazy-check)
     endif()
     if(CMLIB_CLAZY_FIX)
-      add_custom_target(clazy-check-${target} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+      add_custom_target(
-                      COMMAND ${CLAZY_EXE} ${_args} -p ${CMAKE_BINARY_DIR} ${_sources}
+        clazy-check-${target}
-                      COMMAND ${CLANG_APPLY_REPLACEMENTS_EXE} ${CMAKE_BINARY_DIR})
+        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+        COMMAND ${CLAZY_EXE} ${_args} -p ${CMAKE_BINARY_DIR} ${_sources}
+        COMMAND ${CLANG_APPLY_REPLACEMENTS_EXE} ${CMAKE_BINARY_DIR})
     else()
       add_custom_target(clazy-check-${target} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-                      COMMAND ${CLAZY_EXE} ${_args} -p ${CMAKE_BINARY_DIR} ${_sources})
+                        COMMAND ${CLAZY_EXE} ${_args} -p ${CMAKE_BINARY_DIR} ${_sources})
     endif()
     add_dependencies(clazy-check-${target} ${target})
     add_dependencies(clazy-check clazy-check-${target})

CMLibCommonLibraryTarget.cmake

@@ -19,21 +19,22 @@ function(add_common_library target)
                      $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include> $<INSTALL_INTERFACE:include/${target}>)
   set_target_properties(${target} PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
+  # cmake-format: off
   if(BUILD_SHARED_LIBS)
     add_library(${target}_shared SHARED $<TARGET_OBJECTS:${target}>)
-    set_target_properties(
+    set_target_properties(${target}_shared PROPERTIES OUTPUT_NAME ${OUTNAME}
-      ${target}_shared
+      VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR}
-      PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR} OUTPUT_NAME ${OUTNAME}
+      LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
-                 LIBRARY_OUTPUT_DIRECTORY ${CMAKE_INSTALL_LIBDIR})
     install(TARGETS ${target}_shared LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
   endif()
 
   if(NOT SKIP_STATIC_LIBS)
     add_library(${target}_static STATIC $<TARGET_OBJECTS:${target}>)
-    set_target_properties(${target}_static PROPERTIES OUTPUT_NAME ${OUTNAME} ARCHIVE_OUTPUT_DIRECTORY
+    set_target_properties(${target}_static PROPERTIES OUTPUT_NAME ${OUTNAME}
-                                                                             ${CMAKE_INSTALL_LIBDIR})
+      ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
     install(TARGETS ${target}_static ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
   endif()
+  # cmake-format: on
 
   configure_file(${CMLIB_MODULE_DIR}/pc/lib.pc.in ${CMAKE_BINARY_DIR}/${target}.pc)
   install(FILES ${CMAKE_BINARY_DIR}/${target}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)

CMLibCommonTargetProperties.cmake

@@ -18,8 +18,12 @@ function(common_target_properties target)
 
   target_compile_features(${target} ${__visibility} ${COMMON_CXX_FEATURES})
   get_target_property(_targetType ${target} TYPE)
-  if(_targetType STREQUAL "EXECUTABLE" AND CMAKE_CXX_COMPILE_OPTIONS_PIE)
+  if(_targetType STREQUAL "EXECUTABLE")
-    target_compile_options(${target} PUBLIC "${CMAKE_CXX_COMPILE_OPTIONS_PIE}")
+    set_target_properties(${target} PROPERTIES RUNTIME_OUTPUT_DIRECTORY
+                                               ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR})
+    if(CMAKE_CXX_COMPILE_OPTIONS_PIE)
+      target_compile_options(${target} PUBLIC "${CMAKE_CXX_COMPILE_OPTIONS_PIE}")
+    endif()
   endif()
   target_include_directories(
     ${target}
@@ -69,7 +73,8 @@ function(common_target_properties target)
     endif()
   endif()
 
-  set_target_properties(${target} PROPERTIES COTIRE_ENABLE_PRECOMPILED_HEADER ${CMLIB_COTIRE_ENABLE_PRECOMPILED_HEADER})
+  set_target_properties(${target} PROPERTIES COTIRE_ENABLE_PRECOMPILED_HEADER
+                                             ${CMLIB_COTIRE_ENABLE_PRECOMPILED_HEADER})
   set_target_properties(${target} PROPERTIES COTIRE_ADD_UNITY_BUILD ${CMLIB_COTIRE_ADD_UNITY_BUILD})
 
   if(CMAKE_BUILD_TYPE STREQUAL Profile)