Добавлены автозамены для clazy

This reverts commit 48fff012d0.

CMLibBuildTypes.cmake

@@ -24,8 +24,10 @@ endif()
 if(CMAKE_BUILD_TYPE STREQUAL Profile)
   # Ключи компиляции для режима профилирования в зависимости от типа компилятора
   if(CMAKE_CXX_COMPILER_IS_Clang OR CMAKE_CXX_COMPILER_IS_GCC)
-    set(CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_RELEASE} -ggdb -pg -fno-omit-frame-pointer" CACHE STRING "" FORCE)
+    set(CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_RELEASE} -ggdb -pg -fno-omit-frame-pointer" CACHE STRING ""
-    set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_RELEASE} -ggdb -pg -fno-omit-frame-pointer" CACHE STRING "" FORCE)
+                                                                                                 FORCE)
+    set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_RELEASE} -ggdb -pg -fno-omit-frame-pointer" CACHE STRING
+                                                                                                     "" FORCE)
     set(CMAKE_EXE_LINKER_FLAGS_PROFILE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -pg" CACHE STRING "" FORCE)
     set(CMAKE_SHARED_LINKER_FLAGS_PROFILE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} -pg" CACHE STRING "" FORCE)
     set(CMAKE_STATIC_LINKER_FLAGS_PROFILE "${CMAKE_STATIC_LINKER_FLAGS_RELEASE} -pg" CACHE STRING "" FORCE)

CMLibCPack.cmake

@@ -4,9 +4,16 @@ set(CPACK_PACKAGE_NAME ${CMLIB_PROJECT_NAME_LOWER})
 set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
 
 # Параметры для архива исходных текстов
-set(CPACK_SOURCE_GENERATOR TXZ)
+if(NOT CPACK_SOURCE_GENERATOR)
+  set(CPACK_SOURCE_GENERATOR "TXZ")
+endif()
 set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CMLIB_PROJECT_NAME_LOWER}-${CPACK_PACKAGE_VERSION}")
 
+# Типы генераторов для бинарных архивов
+if(NOT CPACK_GENERATOR)
+  set(CPACK_GENERATOR "TXZ" "DEB")
+endif()
+
 # Параметры для архива собранного проекта
 set(CPACK_TARGET_ARCH ${CMAKE_SYSTEM_PROCESSOR})
 if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
@@ -15,6 +22,34 @@ endif()
 set(CPACK_PACKAGE_FILE_NAME "${CMLIB_PROJECT_NAME_LOWER}_${CPACK_TARGET_ARCH}_${CPACK_PACKAGE_VERSION}")
 set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CMLIB_PROJECT_NAME_LOWER}-${CPACK_PACKAGE_VERSION}")
 
+# Список масок для исключения из архива исходных текстов
+set(CPACK_SOURCE_IGNORE_FILES
+    "${CPACK_SOURCE_IGNORE_FILES}"
+    "${CMAKE_BINARY_DIR}"
+    "^${CMAKE_SOURCE_DIR}/.?build.?/"
+    "^${CMAKE_SOURCE_DIR}/.?output.?/"
+    "^${CMAKE_SOURCE_DIR}/files/lib"
+    "^${CMAKE_SOURCE_DIR}/files/log"
+    "CMakeLists.txt.user.*"
+    ".*.autosave"
+    "~$"
+    "\\\\.swp$")
+
+option(CMLIB_COMPACT_SOURCE_PACKAGE "Make compact source package" ON)
+if(CMLIB_COMPACT_SOURCE_PACKAGE)
+  # Список масок для исключения из архива исходных текстов для более компактного архива
+  set(CPACK_SOURCE_IGNORE_FILES
+      "${CPACK_SOURCE_IGNORE_FILES}"
+      "/\\\\.git/"
+      "/\\\\.gitlab-ci/"
+      "\\\\.clang-tidy$"
+      "\\\\.cmake-format$"
+      "\\\\.gitignore$"
+      "\\\\.gitattributes$"
+      "\\\\.gitmodules$"
+      "\\\\.gitlab-ci.yml$")
+endif()
+
 set(CPACK_PROJECT_CONFIG_FILE ${CMAKE_CURRENT_LIST_DIR}/CMLibCPackProject.cmake)
 
 # Правила для сборки пакетов для Debian

CMLibCPackDeb.cmake

@@ -3,6 +3,14 @@ if(NOT DEBIAN_PACKAGE_TYPE)
   set(DEBIAN_PACKAGE_TYPE "unstable")
 endif()
 
+if(NOT CPACK_DEBIAN_PACKAGE_SECTION)
+  set(CPACK_DEBIAN_PACKAGE_SECTION "misc")
+endif()
+
+if(NOT CPACK_DEBIAN_PACKAGE_PRIORITY)
+  set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
+endif()
+
 # По умолчанию пакет для Debian делится на компоненты
 if(NOT CPACK_DEB_COMPONENT_INSTALL)
   set(CPACK_DEB_COMPONENT_INSTALL ON)

CMLibCodeAnalysisClangAnalyze.cmake

@@ -3,28 +3,24 @@ find_program(
   NAMES
     clang-check-10
     clang-check-9
-    clang-check-8
-    clang-check-7
-    clang-check-6.0
     clang-check)
 if(CLANG_CHECK_EXE)
-  option(CLANG_ANALYZE_FIX "Perform fixes for Clang-Check" OFF)
+  option(CMLIB_CLANG_ANALYZE_FIX "Perform fixes for Clang-Check" OFF)
 endif()
 
 function(add_clang_analyze_check target)
   set(_sources ${ARGN})
+  set(_args -analyze -extra-arg="-Wno-unknown-warning-option")
 
   if(CLANG_CHECK_EXE)
-    if(CLANG_CHECK_FIX)
+    if(CMLIB_CLANG_ANALYZE_FIX)
-      list(APPEND _args "-fix")
+      list(APPEND _args "--fixit")
     endif()
     if(NOT TARGET clang-analyze-check)
       add_custom_target(clang-analyze-check)
     endif()
-    add_custom_target(
+    add_custom_target(clang-analyze-check-${target} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-      clang-analyze-check-${target} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                      COMMAND ${CLANG_CHECK_EXE} ${_args} -p ${CMAKE_BINARY_DIR} ${_sources})
-      COMMAND ${CLANG_CHECK_EXE} -analyze -extra-arg="-Wno-unknown-warning-option" -p ${CMAKE_BINARY_DIR}
-              ${_sources})
     add_dependencies(clang-analyze-check-${target} ${target})
     add_dependencies(clang-analyze-check clang-analyze-check-${target})
   else()

CMLibCodeAnalysisClangTidy.cmake

@@ -3,27 +3,24 @@ find_program(
   NAMES
     clang-tidy-10
     clang-tidy-9
-    clang-tidy-8
-    clang-tidy-7
-    clang-tidy-6.0
     clang-tidy)
 if(CLANG_TIDY_EXE)
-  option(CLANG_TIDY_FIX "Perform fixes for Clang-Tidy" OFF)
+  option(CMLIB_CLANG_TIDY_FIX "Perform fixes for Clang-Tidy" OFF)
-  if(CLANG_TIDY_FIX)
-    list(APPEND _args "-fix")
-  endif()
 endif()
 
 function(add_clang_tidy_check target)
   set(_sources ${ARGN})
+  set(_args -extra-arg="-Wno-unknown-warning-option")
 
   if(CLANG_TIDY_EXE)
+    if(CMLIB_CLANG_TIDY_FIX)
+      list(APPEND _args "--fix")
+    endif()
     if(NOT TARGET clang-tidy-check)
       add_custom_target(clang-tidy-check)
     endif()
-    add_custom_target(
+    add_custom_target(clang-tidy-check-${target} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-      clang-tidy-check-${target} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                      COMMAND ${CLANG_TIDY_EXE} ${_args} -p ${CMAKE_BINARY_DIR} ${_sources})
-      COMMAND ${CLANG_TIDY_EXE} -extra-arg="-Wno-unknown-warning-option" -p ${CMAKE_BINARY_DIR} ${_sources})
     add_dependencies(clang-tidy-check-${target} ${target})
     add_dependencies(clang-tidy-check clang-tidy-check-${target})
   else()

CMLibCodeAnalysisClazy.cmake

@@ -1,23 +1,84 @@
-set(clazy_checks
-    container-inside-loop,heap-allocated-small-trivial-type,inefficient-qlist,isempty-vs-count,qt-keywords,unneeded-cast
-)
-
 function(add_clazy_check target)
-  set(_sources ${ARGN})
-
   find_program(CLAZY_EXE NAMES clazy-standalone)
+  set(_sources ${ARGN})
+  set(_clazy_checks
+      "container-inside-loop,heap-allocated-small-trivial-type,inefficient-qlist,isempty-vs-count,qt-keywords,unneeded-cast"
+  )
+  set(_args -checks=level2,${_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()
-    add_custom_target(
+    add_custom_target(clazy-check-${target} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-      clazy-check-${target} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                      COMMAND ${CLAZY_EXE} ${_args} -p ${CMAKE_BINARY_DIR} ${_sources})
-      COMMAND ${CLAZY_EXE} -checks=level2,${clazy_checks} -extra-arg="-Wno-unknown-warning-option" -p
-              ${CMAKE_BINARY_DIR} ${_sources})
     add_dependencies(clazy-check-${target} ${target})
     add_dependencies(clazy-check clazy-check-${target})
+
+    option(CMLIB_CLAZY_FIX_QT_KEYWORDS "Fix Qt keywords" OFF)
+    option(CMLIB_CLAZY_FIX_RANGE_LOOP_ADD_REF "Fix range loop add reference" OFF)
+    option(CMLIB_CLAZY_FIX_RANGE_LOOP_ADD_QASCONST "Fix range loop add qAsConst" OFF)
+    option(CMLIB_CLAZY_FIX_FUNCTION_ARGS_BY_REF "Fix function args by reference" OFF)
+    option(CMLIB_CLAZY_FIX_OLD_STYLE_CONNECT "Fix old style connect" OFF)
+    option(CMLIB_CLAZY_FIX_STRING_ALLOCATIONS "Fix string allocations" OFF)
+
+    if(CMLIB_CLAZY_FIX_QT_KEYWORDS OR
+       CMLIB_CLAZY_FIX_RANGE_LOOP_ADD_REF OR
+       CMLIB_CLAZY_FIX_RANGE_LOOP_ADD_QASCONST OR
+       CMLIB_CLAZY_FIX_FUNCTION_ARGS_BY_REF OR
+       CMLIB_CLAZY_FIX_OLD_STYLE_CONNECT OR
+       CMLIB_CLAZY_FIX_STRING_ALLOCATIONS)
+      if(NOT TARGET clazy-fix)
+        add_custom_target(clazy-fix)
+      endif()
+      if(CMLIB_CLAZY_FIX_QT_KEYWORDS)
+        add_custom_target(clazy-fix-qt-keywords-${target} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+          COMMAND ${CMAKE_COMMAND} -E env "CLAZY_FIXIT=fix-qt-keywords"
+          ${CLAZY_EXE} ${_args} -p ${CMAKE_BINARY_DIR} ${_sources})
+        add_dependencies(clazy-fix-qt-keywords-${target} ${target})
+        add_dependencies(clazy-fix clazy-fix-qt-keywords-${target})
+      endif()
+      if(CMLIB_CLAZY_FIX_RANGE_LOOP_ADD_REF)
+        add_custom_target(clazy-fix-range-loop-add-ref-${target} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+          COMMAND ${CMAKE_COMMAND} -E env "CLAZY_FIXIT=fix-range-loop-add-ref"
+          ${CLAZY_EXE} ${_args} -p ${CMAKE_BINARY_DIR} ${_sources})
+        add_dependencies(clazy-fix-range-loop-add-ref-${target} ${target})
+        add_dependencies(clazy-fix clazy-fix-range-loop-add-ref-${target})
+      endif()
+      if(CMLIB_CLAZY_FIX_RANGE_LOOP_ADD_QASCONST)
+        add_custom_target(clazy-fix-range-loop-add-qasconst-${target} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+          COMMAND ${CMAKE_COMMAND} -E env "CLAZY_FIXIT=fix-range-loop-add-qasconst"
+          ${CLAZY_EXE} ${_args} -p ${CMAKE_BINARY_DIR} ${_sources})
+        add_dependencies(clazy-fix-range-loop-add-qasconst-${target} ${target})
+        add_dependencies(clazy-fix clazy-fix-range-loop-add-qasconst-${target})
+      endif()
+      if(CMLIB_CLAZY_FIX_FUNCTION_ARGS_BY_REF)
+        add_custom_target(clazy-fix-function-args-by-ref-${target} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+          COMMAND ${CMAKE_COMMAND} -E env "CLAZY_FIXIT=fix-function-args-by-ref"
+          ${CLAZY_EXE} ${_args} -p ${CMAKE_BINARY_DIR} ${_sources})
+        add_dependencies(clazy-fix-function-args-by-ref-${target} ${target})
+        add_dependencies(clazy-fix clazy-fix-function-args-by-ref-${target})
+      endif()
+      if(CMLIB_CLAZY_FIX_OLD_STYLE_CONNECT)
+        add_custom_target(clazy-fix-old-style-connect-${target} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+          COMMAND ${CMAKE_COMMAND} -E env "CLAZY_FIXIT=fix-old-style-connect"
+          ${CLAZY_EXE} ${_args} -p ${CMAKE_BINARY_DIR} ${_sources})
+        add_dependencies(clazy-fix-old-style-connect-${target} ${target})
+        add_dependencies(clazy-fix clazy-fix-old-style-connect-${target})
+      endif()
+      # "fix-qlatin1string-allocations", "qstring-allocations");
+      # "fix-fromLatin1_fromUtf8-allocations", "qstring-allocations");
+      # "fix-fromCharPtrAllocations", "qstring-allocations");
+      if(CMLIB_CLAZY_FIX_STRING_ALLOCATIONS)
+        add_custom_target(clazy-fix-string-${target} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+          COMMAND ${CMAKE_COMMAND} -E env "CLAZY_FIXIT=fix-qlatin1string-allocations"
+          ${CLAZY_EXE} ${_args} -p ${CMAKE_BINARY_DIR} ${_sources})
+        add_dependencies(clazy-fix-string-${target} ${target})
+        add_dependencies(clazy-fix clazy-fix-string-${target})
+      endif()
+    endif()
   else()
     message(STATUS "CMLIB warning:")
-    message(STATUS "  Clazy analyzer is not found")
+    message(STATUS "  Clazy standalone analyzer is not found")
   endif()
 endfunction()

CMLibCodeCoverage.cmake

@@ -1,10 +1,10 @@
-option(ENABLE_CODE_COVERAGE "Enable code coverage support" OFF)
+option(CMLIB_ENABLE_CODE_COVERAGE "Enable code coverage support" OFF)
 find_program(LCOV_EXE NAMES lcov)
 find_program(GENHTML_EXE NAMES genhtml)
 
 function(add_code_coverage target)
 
-  if(ENABLE_CODE_COVERAGE)
+  if(CMLIB_ENABLE_CODE_COVERAGE)
     if(CMAKE_CXX_COMPILER_IS_GCC)
       target_compile_options(${target} PUBLIC "--coverage")
       get_target_property(LF ${target} LINK_FLAGS)

CMLibCommon.cmake

@@ -27,6 +27,7 @@ include(CMLibCompilerFlags)
 include(CMLibDistCC)
 include(CMLibCompilerFeaturesHPPGenerate)
 include(CMLibFlagRemove)
+include(CMLibCotire)
 include(CMLibBuildTypes)
 include(CMLibCommonTargetProperties)
 include(CMLibCommonLibraryTarget)
@@ -36,7 +37,6 @@ include(CMLibCodeAnalysisClangTidy)
 include(CMLibCodeAnalysisClazy)
 include(CMLibCodeCoverage)
 include(CMLibSanitizers)
-include(cotire)
 
 include(CMLibFormatSources)
 include(CMLibDocDoxygen)

CMLibCommonTargetProperties.cmake

@@ -33,18 +33,6 @@ function(common_target_properties target)
       if(_targetType STREQUAL "EXECUTABLE")
         target_compile_options(${target} PUBLIC "${Qt5Core_EXECUTABLE_COMPILE_FLAGS}")
       endif()
-      # set_target_properties(${target} PROPERTIES AUTOMOC TRUE)
-      # set_target_properties(${target} PROPERTIES AUTORCC TRUE)
-    endif()
-    if(TARGET Qt5::Widgets)
-      # set_target_properties(${target} PROPERTIES AUTOUIC TRUE)
-      #      if(CMAKE_VERSION VERSION_LESS 3.7.99)
-      #        target_include_directories(
-      #          ${target}
-      #          PUBLIC
-      #          $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/${target}_autogen/include>
-      #          )
-      #      endif()
     endif()
     if(CMAKE_CXX_COMPILER_IS_GCC AND NOT APPLE)
       set_target_properties(${target} PROPERTIES LINK_FLAGS "-Wl,--no-as-needed")
@@ -81,6 +69,9 @@ 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_ADD_UNITY_BUILD ${CMLIB_COTIRE_ADD_UNITY_BUILD})
+
   if(CMAKE_BUILD_TYPE STREQUAL Profile)
     target_compile_definitions(${target} ${__visibility} PROFILE)
   elseif(CMAKE_BUILD_TYPE STREQUAL Debug)

CMLibCompilerFlags.cmake

@@ -1,5 +1,7 @@
 # based on https://github.com/bluescarni/yacma
 
+option(CMLIB_WARNING_FLAGS "Enable warning flags" ON)
+
 include(CheckCXXCompilerFlag)
 
 macro(CHECK_ENABLE_CXX_FLAG flag)
@@ -35,7 +37,7 @@ if(CMAKE_CXX_COMPILER_IS_CLANG OR CMAKE_CXX_COMPILER_IS_INTEL OR CMAKE_CXX_COMPI
   set(CMAKE_CXX_STANDARD_REQUIRED YES)
   set(CMAKE_CXX_EXTENSIONS YES)
 
-  if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+  if(CMLIB_WARNING_FLAGS AND CMAKE_BUILD_TYPE STREQUAL "Debug")
     check_enable_cxx_flag(-Wall)
     check_enable_cxx_flag(-Wextra)
     check_enable_cxx_flag(-Wnon-virtual-dtor)

CMLibCotire.cmake

@@ -0,0 +1,6 @@
+include(cotire)
+
+if(COMMAND cotire)
+  option(CMLIB_COTIRE_ENABLE_PRECOMPILED_HEADER "Enable precompiled headers" OFF)
+  option(CMLIB_COTIRE_ADD_UNITY_BUILD "Enable unity build" OFF)
+endif()

CMLibRequiredVariables.cmake

@@ -10,10 +10,6 @@ endif()
 
 set(CPACK_PACKAGE_VENDOR ${ORGANIZATION_NAME})
 
-if(NOT CPACK_GENERATOR)
-  message(FATAL_ERROR "Required variable CPACK_GENERATOR is not defined")
-endif()
-
 if(NOT CPACK_PACKAGE_CONTACT)
   message(FATAL_ERROR "Required variable CPACK_PACKAGE_CONTACT is not defined")
 endif()
@@ -21,15 +17,3 @@ endif()
 if(NOT CPACK_PACKAGE_DESCRIPTION_SUMMARY)
   message(FATAL_ERROR "Required variable CPACK_PACKAGE_DESCRIPTION_SUMMARY is not defined")
 endif()
-
-if(NOT CPACK_DEBIAN_PACKAGE_SECTION)
-  message(FATAL_ERROR "Required variable CPACK_DEBIAN_PACKAGE_SECTION is not defined")
-endif()
-
-if(NOT CPACK_DEBIAN_PACKAGE_PRIORITY)
-  message(FATAL_ERROR "Required variable CPACK_DEBIAN_PACKAGE_PRIORITY is not defined")
-endif()
-
-if(NOT CPACK_SOURCE_IGNORE_FILES)
-  message(FATAL_ERROR "Required variable CPACK_SOURCE_IGNORE_FILES is not defined")
-endif()

thirdparty/cotire.cmake

@@ -931,7 +931,13 @@ function (cotire_add_includes_to_cmd _cmdVar _language _includesVar _systemInclu
 					list (FIND ${_systemIncludesVar} "${_include}" _index)
 				endif()
 				if (_index GREATER -1)
-					list (APPEND ${_cmdVar} "${CMAKE_INCLUDE_SYSTEM_FLAG_${_language}}${CMAKE_INCLUDE_FLAG_SEP_${_language}}${_include}")
+					if (CMAKE_${_language}_COMPILER_ID MATCHES "GNU|Clang")
+						string(REPLACE " " "" _flag ${CMAKE_INCLUDE_SYSTEM_FLAG_${_language}})
+						list (APPEND ${_cmdVar} "${_flag}")
+						list (APPEND ${_cmdVar} "${_include}")
+					else()
+						list (APPEND ${_cmdVar} "${CMAKE_INCLUDE_SYSTEM_FLAG_${_language}}${CMAKE_INCLUDE_FLAG_SEP_${_language}}${_include}")
+					endif()
 				else()
 					list (APPEND ${_cmdVar} "${CMAKE_INCLUDE_FLAG_${_language}}${CMAKE_INCLUDE_FLAG_SEP_${_language}}${_include}")
 				endif()