Версия 0.6.0

.gitignore

@@ -1,3 +1,4 @@
+build
 *.deb
 MyxCMake/MyxCMakeConfigVersion.cmake
 

.gitlab-ci.yml

@@ -0,0 +1,39 @@
+include:
+  - project: 'f1x1t/gitlab-ci'
+    ref: master
+    file: 'scheduled.yml'
+
+elbrus-nightly:
+  script:
+    - ./build_deb.sh
+  extends: .scheduled-elbrus
+
+smolensk15-nightly:
+  script:
+    - ./build_deb.sh
+  extends: .scheduled-smolensk15
+
+smolensk17-nightly:
+  script:
+    - ./build_deb.sh
+  extends: .scheduled-smolensk15
+
+orel212-nightly:
+  script:
+    - ./build_deb.sh
+  extends: .scheduled-orel212
+
+bionic-nightly:
+  script:
+    - ./build_deb.sh
+  extends: .scheduled-bionic
+
+focal-nightly:
+  script:
+    - ./build_deb.sh
+  extends: .scheduled-focal
+
+jammy-nightly:
+  script:
+    - ./build_deb.sh
+  extends: .scheduled-jammy

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.0)
-project(myx-cmake VERSION 0.3.6 LANGUAGES)
+project(myx-cmake VERSION 0.6.0 LANGUAGES)
 
 include(GNUInstallDirs)
 file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake

MyxCMake/MyxCMakeConfig.cmake

@@ -5,7 +5,7 @@ get_filename_component(MYX_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" DIRECTORY)
 
 set(MYX_CMAKE_FUNCTIONS_DIR "${MYX_CMAKE_DIR}/functions")
 if(NOT IS_DIRECTORY "${MYX_CMAKE_FUNCTIONS_DIR}")
-  message(STATUS "MyxCMake: Functions directory is not found.")
+  myx_cmake_message_warning("MyxCMake: Functions directory is not found.")
 else()
   if(NOT ${MYX_CMAKE_FUNCTIONS_DIR} IN_LIST CMAKE_MODULE_PATH)
     list(INSERT CMAKE_MODULE_PATH 0 "${MYX_CMAKE_FUNCTIONS_DIR}")
@@ -14,7 +14,7 @@ endif()
 
 set(MYX_CMAKE_THIRDPARTY_DIR "${MYX_CMAKE_DIR}/thirdparty")
 if(NOT IS_DIRECTORY "${MYX_CMAKE_THIRDPARTY_DIR}")
-  message(STATUS "MyxCMake: Thirdparty submodule is not found.")
+  myx_cmake_message_warning("MyxCMake: Thirdparty submodule is not found.")
 else()
   if(NOT ${MYX_CMAKE_THIRDPARTY_DIR} IN_LIST CMAKE_MODULE_PATH)
     list(INSERT CMAKE_MODULE_PATH 0 "${MYX_CMAKE_THIRDPARTY_DIR}")
@@ -23,7 +23,7 @@ endif()
 
 set(MYX_CMAKE_SANITIZERS_DIR "${MYX_CMAKE_DIR}/sanitizers")
 if(NOT IS_DIRECTORY "${MYX_CMAKE_SANITIZERS_DIR}")
-  message(STATUS "MyxCMake: Sanitizers submodule is not found.")
+  myx_cmake_message_warning(STATUS "MyxCMake: Sanitizers submodule is not found.")
 else()
   if(NOT ${MYX_CMAKE_SANITIZERS_DIR} IN_LIST CMAKE_MODULE_PATH)
     list(INSERT CMAKE_MODULE_PATH 0 "${MYX_CMAKE_SANITIZERS_DIR}")
@@ -33,7 +33,7 @@ endif()
 
 set(MYX_CMAKE_FIND_DIR "${MYX_CMAKE_DIR}/find")
 if(NOT IS_DIRECTORY "${MYX_CMAKE_FIND_DIR}")
-  message(STATUS "MyxCMake: Custom find submodules are not found.")
+  myx_cmake_message_warning("MyxCMake: Custom find submodules are not found.")
 else()
   if(NOT ${MYX_CMAKE_FIND_DIR} IN_LIST CMAKE_MODULE_PATH)
     list(INSERT CMAKE_MODULE_PATH 0 "${MYX_CMAKE_FIND_DIR}")
@@ -42,7 +42,7 @@ endif()
 
 set(MYX_CMAKE_MODULES_DIR "${MYX_CMAKE_DIR}/modules")
 if(NOT IS_DIRECTORY "${MYX_CMAKE_MODULES_DIR}")
-  message(FATAL_ERROR "MyxCMake: Requried modules directory is not found.")
+  myx_cmake_message_error("MyxCMake: Requried modules directory is not found.")
 else()
   if(NOT ${MYX_CMAKE_MODULES_DIR} IN_LIST CMAKE_MODULE_PATH)
     list(INSERT CMAKE_MODULE_PATH 0 "${MYX_CMAKE_MODULES_DIR}")

MyxCMake/functions/MyxCMakeDocBreathe.cmake

@@ -79,6 +79,11 @@ function(myx_cmake_doc_breathe)
       endif()
     endif()
 
+    if(NOT TARGET myx-cmake-doc-breathe)
+      add_custom_target(myx-cmake-doc-breathe)
+    endif()
+    add_dependencies(myx-cmake-doc-breathe ${_target})
+
     install(DIRECTORY ${CMAKE_BINARY_DIR}/doc/breathe/html
             COMPONENT doc OPTIONAL
             DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/breathe)

MyxCMake/functions/MyxCMakeDocDoxygen.cmake

@@ -49,6 +49,10 @@ function(myx_cmake_doc_doxygen)
               COMPONENT doc OPTIONAL
               DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/doxygen)
     endif()
+    if(NOT TARGET myx-cmake-doc-doxygen)
+      add_custom_target(myx-cmake-doc-doxygen)
+    endif()
+    add_dependencies(myx-cmake-doc-doxygen ${_target})
   else()
     message(STATUS "MyxCMake: target ${_target} is already defined.")
   endif()

MyxCMake/functions/MyxCMakeGenerateGitInfoHeader.cmake

@@ -1,7 +1,7 @@
 function(myx_cmake_generate_git_info_header)
-  set(output_file ${CMAKE_BINARY_DIR}/include/myx_cmake_git_info.hpp)
+  set(output_file ${CMAKE_BINARY_DIR}/include/myx_cmake_git_info_p.hpp)
   if(MYX_CMAKE_GENERATED_HEADERS_PATH)
-    set(output_file ${MYX_CMAKE_GENERATED_HEADERS_PATH}/myx_cmake_git_info.hpp)
+    set(output_file ${MYX_CMAKE_GENERATED_HEADERS_PATH}/myx_cmake_git_info_p.hpp)
   elseif(ARGV0)
     set(output_file ${ARGV0})
   endif()

MyxCMake/functions/MyxCMakeGeneratePrivateConfigHeader.cmake

@@ -2,9 +2,9 @@ function(myx_cmake_generate_private_config_header)
   include(MyxCMakeLargeFiles)
   myx_cmake_test_large_files(HAVE_LARGEFILES)
 
-  set(output_file ${CMAKE_BINARY_DIR}/include/myx_cmake_private_config.hpp)
+  set(output_file ${CMAKE_BINARY_DIR}/include/myx_cmake_private_config_p.hpp)
   if(MYX_CMAKE_GENERATED_HEADERS_PATH)
-    set(output_file ${MYX_CMAKE_GENERATED_HEADERS_PATH}/myx_cmake_private_config.hpp)
+    set(output_file ${MYX_CMAKE_GENERATED_HEADERS_PATH}/myx_cmake_private_config_p.hpp)
   elseif(ARGV0)
     set(output_file ${ARGV0})
   endif()

MyxCMake/functions/MyxCMakeHighPrecisionMath.cmake

@@ -7,7 +7,7 @@ function(myx_cmake_enable_high_precision_math)
     if(MPFR_FOUND)
       find_package(MPFRCppThirdparty)
     else()
-      message(FATAL_ERROR "Nor Quadmath, nor MPFR found.")
+      myx_cmake_message_error("MyxCMake: Nor Quadmath, nor MPFR found.")
     endif()
   endif()
 endfunction()

MyxCMake/modules/MyxCMakeAddSharedLibrary.cmake

@@ -5,22 +5,28 @@ function(myx_cmake_add_shared_library target)
   if(NOT BUILD_${_ctarget}_SHARED)
     return()
   endif()
+
   get_target_property(__target_type ${target} TYPE)
   if(NOT __target_type STREQUAL OBJECT_LIBRARY)
-    message(FATAL_ERROR
+    myx_cmake_message_error("MyxCMake: myx_cmake_add_shared_library needs target of type OBJECT_LIBRARY")
-      "MyxCMake: myx_cmake_add_shared_library needs target of type OBJECT_LIBRARY")
+  endif()
-    return()
+
+  get_target_property(__output_name ${target} OUTPUT_NAME)
+  if(NOT __output_name)
+    set(__output_name ${target})
   endif()
 
   add_library(${target}-shared SHARED $<TARGET_OBJECTS:${target}>)
-  set_target_properties(
+  # cmake-format: off
-    ${target}-shared
+  set_target_properties(${target}-shared
-    PROPERTIES OUTPUT_NAME ${target}
+    PROPERTIES
+      OUTPUT_NAME ${__output_name}
       VERSION ${PROJECT_VERSION}
       SOVERSION ${PROJECT_VERSION_MAJOR}
-               LIBRARY_OUTPUT_DIRECTORY
+      LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
-               ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
+  install(TARGETS
-  install(TARGETS ${target}-shared
+    ${target}-shared
       COMPONENT main
       LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+  # cmake-format: on
 endfunction()

MyxCMake/modules/MyxCMakeAddStaticLibrary.cmake

@@ -5,20 +5,26 @@ function(myx_cmake_add_static_library target)
   if(NOT BUILD_${_ctarget}_STATIC)
     return()
   endif()
+
   get_target_property(__target_type ${target} TYPE)
   if(NOT __target_type STREQUAL OBJECT_LIBRARY)
-    message(FATAL_ERROR
+    myx_cmake_message_error("MyxCMake: myx_cmake_add_static_library needs target of type OBJECT_LIBRARY")
-      "MyxCMake: myx_cmake_add_static_library needs target of type OBJECT_LIBRARY")
+  endif()
-    return()
+
+  get_target_property(__output_name ${target} OUTPUT_NAME)
+  if(NOT __output_name)
+    set(__output_name ${target})
   endif()
 
   add_library(${target}-static STATIC $<TARGET_OBJECTS:${target}>)
+  # cmake-format: off
   set_target_properties(${target}-static
     PROPERTIES
-    OUTPUT_NAME ${target}
+      OUTPUT_NAME ${__output_name}
       ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
-  install(TARGETS ${target}-static
+  install(TARGETS
+    ${target}-static
       COMPONENT static
       ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
+  # cmake-format: on
 endfunction()

MyxCMake/modules/MyxCMakeBuildTypes.cmake

@@ -2,12 +2,12 @@ cmake_policy(PUSH)
 cmake_policy(SET CMP0057 NEW) # IN_LIST operator
 
 option(MYX_CMAKE_ENABLE_WARNING_FLAGS "Enable autodetected warning flags" ON)
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON CACHE BOOL
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON
-  "Enable generation of compile_commands.json." FORCE)
+  CACHE BOOL "Enable generation of compile_commands.json" FORCE)
 
 # Добавление конфигурации для профилирования
 if(CMAKE_CONFIGURATION_TYPES)
-  if(NOT "Profile" IN_LIST CMAKE_CONFIGURATION_TYPES)
+  if(NOT Profile IN_LIST CMAKE_CONFIGURATION_TYPES)
     list(APPEND CMAKE_CONFIGURATION_TYPES Profile)
   endif()
 else()
@@ -16,7 +16,7 @@ else()
   if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE Debug CACHE STRING "" FORCE)
   elseif(NOT "${CMAKE_BUILD_TYPE}" IN_LIST _allowed_build_types)
-    message(FATAL_ERROR "Invalid build type: ${CMAKE_BUILD_TYPE}")
+    myx_cmake_message_error("Invalid build type: ${CMAKE_BUILD_TYPE}")
   endif()
 endif()
 
@@ -49,8 +49,8 @@ if(CMAKE_BUILD_TYPE STREQUAL Profile)
   elseif(CMAKE_CXX_COMPILER_IS_MSVC)
     message("Set options for profiling with Visual Studio C++")
   endif()
-  set(CMAKE_VERBOSE_MAKEFILE ON CACHE BOOL
+  set(CMAKE_VERBOSE_MAKEFILE ON
-    "Enable generation of verbose build scripts." FORCE)
+    CACHE BOOL "Enable generation of verbose build scripts." FORCE)
 elseif(CMAKE_BUILD_TYPE STREQUAL Debug)
   # В режиме отладки подробный вывод сообщений компилятора
   if(CMAKE_CXX_COMPILER_IS_CLANG OR CMAKE_CXX_COMPILER_IS_GCC)
@@ -68,15 +68,15 @@ elseif(CMAKE_BUILD_TYPE STREQUAL Debug)
           CACHE STRING "" FORCE)
     endif()
   endif()
-  set(CMAKE_VERBOSE_MAKEFILE ON CACHE BOOL
+  set(CMAKE_VERBOSE_MAKEFILE ON
-    "Enable generation of verbose build scripts." FORCE)
+    CACHE BOOL "Enable generation of verbose build scripts." FORCE)
 elseif(CMAKE_BUILD_TYPE STREQUAL Release)
   set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${MYX_CMAKE_DETECTED_CXX_FLAGS}"
     CACHE STRING "" FORCE)
 elseif(CMAKE_BUILD_TYPE STREQUAL None)
   # Режим None используется для статического анализа кода
-  set(CMAKE_VERBOSE_MAKEFILE ON CACHE BOOL
+  set(CMAKE_VERBOSE_MAKEFILE ON
-    "Enable generation of verbose build scripts." FORCE)
+    CACHE BOOL "Enable generation of verbose build scripts." FORCE)
 endif()
 
 unset(_gcc_debug_flags)

MyxCMake/modules/MyxCMakeCPack.cmake

@@ -40,7 +40,7 @@ option(MYX_CMAKE_COMPACT_SOURCE_PACKAGE "Make compact source package" ON)
 if(MYX_CMAKE_COMPACT_SOURCE_PACKAGE)
   # Список масок для исключения из архива исходных текстов для более компактного архива
   set(CPACK_SOURCE_IGNORE_FILES
-    "${CPACK_SOURCE_IGNORE_FILES}"
+    ${CPACK_SOURCE_IGNORE_FILES}
     "\\\\.git"
     "/\\\\.git/"
     "/\\\\.gitlab-ci/"

MyxCMake/modules/MyxCMakeCheckPaths.cmake

@@ -10,13 +10,13 @@ get_filename_component(_binary_realpath "${CMAKE_BINARY_DIR}" REALPATH)
 get_filename_component(_install_realpath "${CMAKE_INSTALL_PREFIX}" REALPATH)
 
 if(_install_realpath STREQUAL _binary_realpath)
-  message(FATAL_ERROR "MyxCMake: Cannot install into build directory.")
+  myx_cmake_message_error("MyxCMake: Cannot install into build directory.")
 endif()
 
 if(_install_realpath STREQUAL _source_realpath)
-  message(FATAL_ERROR "MyxCMake: Cannot install into source directory.")
+  myx_cmake_message_error("MyxCMake: Cannot install into source directory.")
 endif()
 
 if(_source_realpath STREQUAL _binary_realpath)
-  message(FATAL_ERROR "MyxCMake: In-source builds are not allowed.")
+  myx_cmake_message_error("MyxCMake: In-source builds are not allowed.")
 endif()

MyxCMake/modules/MyxCMakeCodeAnalyzeClangCheck.cmake

@@ -12,7 +12,7 @@ unset(CLANG_CHECK_NAMES)
 
 function(myx_cmake_analyze_clang_check target)
   if(CLANG_CHECK_EXE)
-    set(_args --analyze --extra-arg="-Wno-unknown-warning-option")
+    set(_args --analyze --extra-arg=-Wno-unknown-warning-option)
     get_target_property(__sources ${target} SOURCES)
     list(FILTER __sources EXCLUDE REGEX "qrc_.*\\.cpp$")
     list(FILTER __sources EXCLUDE REGEX "moc_.*\\.cpp$")
@@ -24,7 +24,8 @@ function(myx_cmake_analyze_clang_check target)
     if(NOT TARGET myx-cmake-analyze-clang-check)
       add_custom_target(myx-cmake-analyze-clang-check)
     endif()
-    add_custom_target(${target}-analyze-clang-check WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+    add_custom_target(${target}-analyze-clang-check
+      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
       COMMAND ${CLANG_CHECK_EXE} ${_args} -p ${CMAKE_BINARY_DIR} ${__sources})
     add_dependencies(${target}-analyze-clang-check ${target})
     add_dependencies(myx-cmake-analyze-clang-check ${target}-analyze-clang-check)

MyxCMake/modules/MyxCMakeCodeAnalyzeClangTidy.cmake

@@ -19,12 +19,13 @@ function(myx_cmake_analyze_clang_tidy target)
     list(FILTER __sources EXCLUDE REGEX "ui_.*\\.h$")
 
     if(MYX_CMAKE_CLANG_TIDY_FIX)
-      list(APPEND _args "--fix")
+      list(APPEND _args "-fix-errors")
     endif()
     if(NOT TARGET myx-cmake-analyze-clang-tidy)
       add_custom_target(myx-cmake-analyze-clang-tidy)
     endif()
-    add_custom_target(${target}-analyze-clang-tidy WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+    add_custom_target(${target}-analyze-clang-tidy
+      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
       COMMAND ${CLANG_TIDY_EXE} ${_args} -p ${CMAKE_BINARY_DIR} ${__sources})
     add_dependencies(${target}-analyze-clang-tidy ${target})
     add_dependencies(myx-cmake-analyze-clang-tidy ${target}-analyze-clang-tidy)

MyxCMake/modules/MyxCMakeCodeAnalyzeClazy.cmake

@@ -19,20 +19,21 @@ function(myx_cmake_analyze_clazy target)
     list(FILTER __sources EXCLUDE REGEX "qrc_.*\\.cpp$")
     list(FILTER __sources EXCLUDE REGEX "moc_.*\\.cpp$")
     list(FILTER __sources EXCLUDE REGEX "ui_.*\\.h$")
-    set(_args -checks=${ARG_CHECKS} -extra-arg="-Wno-unknown-warning-option"
+    set(_args -checks=${ARG_CHECKS}
+              -extra-arg=-Wno-unknown-warning-option
               -export-fixes=clazy-fixes-file.yaml)
 
     if(NOT TARGET myx-cmake-analyze-clazy)
       add_custom_target(myx-cmake-analyze-clazy)
     endif()
     if(MYX_CMAKE_CLAZY_FIX)
-      add_custom_target(
+      add_custom_target(${target}-analyze-clazy
-        ${target}-analyze-clazy
         WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
         COMMAND ${CLAZY_EXE} ${_args} -p ${CMAKE_BINARY_DIR} ${__sources}
         COMMAND ${CLANG_APPLY_REPLACEMENTS_EXE} ${CMAKE_BINARY_DIR})
     else()
-      add_custom_target(${target}-analyze-clazy WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+      add_custom_target(${target}-analyze-clazy
+        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
         COMMAND ${CLAZY_EXE} ${_args} -p ${CMAKE_BINARY_DIR} ${__sources})
     endif()
     add_dependencies(${target}-analyze-clazy ${target})

MyxCMake/modules/MyxCMakeCodeAnalyzePvsStudio.cmake

@@ -1,11 +1,13 @@
 if(CMAKE_EXPORT_COMPILE_COMMANDS)
   include(PVS-Studio)
+  find_program(PVS_STUDIO_ANALYZER_EXE pvs-studio-analyzer)
+  find_program(PVS_STUDIO_CONVERTER_EXE plog-converter)
 else()
   message(STATUS "MyxCMake: CMAKE_EXPORT_COMPILE_COMMANDS is not set. PVS checks will be disabled.")
 endif()
 
 function(myx_cmake_analyze_pvs_studio target)
-  if(EXISTS PVS_STUDIO_BIN_PATH AND EXISTS PVS_STUDIO_CONVERTER_PATH)
+  if(PVS_STUDIO_ANALYZER_EXE AND PVS_STUDIO_CONVERTER_EXE)
     set(options)
     set(oneValueArgs CHECKS)
     set(multiValueArgs)
@@ -19,8 +21,7 @@ function(myx_cmake_analyze_pvs_studio target)
         "#endif // MYX_CMAKE_PVS_STUDIO_HEADER_HPP_\n")
 
       pvs_studio_add_target(TARGET myx-cmake-analyze-pvs-studio
-      CONFIG ${PVS_STUDIO_CONFIG}
+        LOG
-      DEPENDS ${PVS_STUDIO_CONFIG}
         COMPILE_COMMANDS
         HIDE_HELP
         OUTPUT FORMAT errorfile

MyxCMake/modules/MyxCMakeCodeCoverage.cmake

@@ -6,27 +6,37 @@ if(MYX_CMAKE_CODE_COVERAGE)
 endif()
 
 function(myx_cmake_code_coverage target)
-  if(CMAKE_CXX_COMPILER_IS_GCC AND MYX_CMAKE_CODE_COVERAGE)
+  if(MYX_CMAKE_CODE_COVERAGE)
+    if(CMAKE_CXX_COMPILER_IS_GCC)
       target_compile_options(${target} PUBLIC "--coverage")
       set_property(
         TARGET ${target}
         APPEND_STRING
         PROPERTY LINK_FLAGS " --coverage")
+    endif()
+    if(CMAKE_CXX_COMPILER_IS_CLANG)
+      target_compile_options(${target} PUBLIC "-fprofile-instr-generate -fcoverage-mapping")
+      set_property(
+        TARGET ${target}
+        APPEND_STRING
+        PROPERTY LINK_FLAGS " --coverage")
+    endif()
 
     if(LCOV_EXE)
-      add_custom_target(
+      add_custom_target(${target}-coverage
-        ${target}-coverage
         WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-        COMMAND ${LCOV_EXE} --test-name ${target} --output "${target}.lcov"
+        COMMAND ${LCOV_EXE} --test-name ${target} --output "${target}.lcov" --capture
-                --capture --directory ${CMAKE_BINARY_DIR})
+                --no-external
+                --base-directory ${CMAKE_SOURCE_DIR}
+                --directory ${CMAKE_BINARY_DIR})
+#                --exclude "/usr/\\\*"
+#                --exclude "${CMAKE_BINARY_DIR}/\\\*"
       add_dependencies(${target}-coverage ${target})
 
       if(GENHTML_EXE)
-        add_custom_target(
+        add_custom_target(${target}-coverage-report
-          ${target}-coverage-report
           WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-          COMMAND ${GENHTML_EXE} --output-directory "${target}-coverage-html"
+          COMMAND ${GENHTML_EXE} --output-directory "${target}-coverage-html" "${target}.lcov")
-                  "${target}.lcov")
         add_dependencies(${target}-coverage-report ${target}-coverage)
       endif()
     endif()

MyxCMake/modules/MyxCMakeColoredMessages.cmake

@@ -31,7 +31,7 @@ function(myx_cmake_message_status)
 endfunction()
 
 function(myx_cmake_message_notice)
-  message(STATUS ${MyxCMakeColorBold}${ARGV}${MyxCMakeColorReset})
+  message(${MyxCMakeColorBold}${ARGV}${MyxCMakeColorReset})
 endfunction()
 
 function(myx_cmake_message)

MyxCMake/modules/MyxCMakeCommon.cmake

@@ -5,8 +5,7 @@ include(MyxCMakeColoredMessages)
 include(MyxCMakeCheckPaths)
 
 link_directories(${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
-set(CMAKE_CXX_SOURCE_FILE_EXTENSIONS
+set(CMAKE_CXX_SOURCE_FILE_EXTENSIONS ${CMAKE_CXX_SOURCE_FILE_EXTENSIONS};tpp;tcc)
-    ${CMAKE_CXX_SOURCE_FILE_EXTENSIONS};tpp;tcc)
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
 include(MyxCMakeProjectVersion)
@@ -15,6 +14,7 @@ include(MyxCMakeGlobalFunctions)
 include(MyxCMakeGlobalVariables)
 include(MyxCMakeDates)
 include(MyxCMakeLSBInfo)
+include(MyxCMakePaths)
 include(MyxCMakeCompiler)
 include(MyxCMakeCompilerFlags)
 include(MyxCMakeDistCC)

MyxCMake/modules/MyxCMakeCommonTargetProperties.cmake

@@ -1,7 +1,6 @@
 function(myx_cmake_common_target_properties target)
   if(NOT TARGET ${target})
-    message(FATAL_ERROR "MyxCMake: Target ${target} does not exists.")
+    myx_cmake_message_error("MyxCMake: Target ${target} does not exists.")
-    return()
   endif()
   get_target_property(_target_type ${target} TYPE)
 
@@ -12,8 +11,7 @@ function(myx_cmake_common_target_properties target)
     #
     if(TARGET Qt5::Core)
       if(_target_type STREQUAL EXECUTABLE)
-        target_compile_options(${target}
+        target_compile_options(${target} PUBLIC ${Qt5Core_EXECUTABLE_COMPILE_FLAGS})
-                               PUBLIC ${Qt5Core_EXECUTABLE_COMPILE_FLAGS})
       endif()
       if(NOT MYX_CMAKE_DEBUG_OUTPUT)
         target_compile_definitions(${target} PUBLIC QT_NO_DEBUG_OUTPUT)
@@ -52,8 +50,7 @@ function(myx_cmake_common_target_properties target)
 
   endif()
 
-  target_compile_features(${target} ${__visibility} cxx_alias_templates
+  target_compile_features(${target} ${__visibility} cxx_alias_templates cxx_nullptr cxx_override)
-                                    cxx_nullptr cxx_override)
   if(_target_type STREQUAL EXECUTABLE)
     set_target_properties(${target} PROPERTIES
       POSITION_INDEPENDENT_CODE ON
@@ -72,13 +69,6 @@ function(myx_cmake_common_target_properties target)
     set_target_properties(${target} PROPERTIES POSITION_INDEPENDENT_CODE ON)
   endif()
 
-  if(_target_type MATCHES "_LIBRARY$" AND NOT ${target}-install-headers)
-    # Цель, используемая только для установки заголовочных файлов без компиляции проекта
-    add_custom_target(${target}-install-headers
-      COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=dev
-              -P "${CMAKE_BINARY_DIR}/cmake_install.cmake")
-  endif()
-
   # LTO only for executables (not libraries) in Release build type
   if(_target_type STREQUAL EXECUTABLE AND CMAKE_BUILD_TYPE STREQUAL Release)
     check_cxx_compiler_flag(-flto CXX_HAS_LTO_FLAG)
@@ -121,6 +111,13 @@ function(myx_cmake_common_target_properties target)
   myx_cmake_analyze_pvs_studio(${target})
   myx_cmake_format_sources(${target})
 
+  if(_target_type MATCHES "_LIBRARY$" AND NOT ${target}-install-headers)
+    # Цель, используемая только для установки заголовочных файлов без компиляции проекта
+    add_custom_target(${target}-install-headers
+      COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=dev
+              -P "${CMAKE_BINARY_DIR}/cmake_install.cmake")
+  endif()
+
   # Создание в каталоге ${CMAKE_BINARY_DIR} стандартных каталогов bin,include,lib
   if(NOT TARGET ${target}-default-directories)
     add_custom_target(
@@ -153,10 +150,9 @@ function(myx_cmake_common_target_properties target)
   endif()
 endfunction()
 
-function(myx_cmake_common_target_properties_post target)
+function(myx_cmake_common_target_properties_post_link target)
   if(NOT TARGET ${target})
-    message(FATAL_ERROR "MyxCMake: Target ${target} does not exists.")
+    myx_cmake_message_error("MyxCMake: Target ${target} does not exists.")
-    return()
   endif()
   get_target_property(_target_type ${target} TYPE)
 

MyxCMake/modules/MyxCMakeCompiler.cmake

@@ -1,8 +1,8 @@
 # C compiler name
 if(CMAKE_C_COMPILER_ID STREQUAL "Intel")
   set(CMAKE_C_COMPILER_IS_INTEL ON)
-elseif(CMAKE_C_COMPILER_ID STREQUAL "Clang" OR CMAKE_C_COMPILER_ID STREQUAL
+elseif(CMAKE_C_COMPILER_ID STREQUAL "Clang" OR
-                                               "AppleClang")
+       CMAKE_C_COMPILER_ID STREQUAL "AppleClang")
   set(CMAKE_C_COMPILER_IS_CLANG ON)
 elseif(CMAKE_C_COMPILER_ID STREQUAL "GNU")
   set(CMAKE_C_COMPILER_IS_GCC ON)
@@ -13,8 +13,8 @@ endif()
 # C++ compiler name
 if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
   set(CMAKE_CXX_COMPILER_IS_INTEL ON)
-elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL
+elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR
-                                                 "AppleClang")
+       CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
   set(CMAKE_CXX_COMPILER_IS_CLANG ON)
 elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
   set(CMAKE_CXX_COMPILER_IS_GCC ON)
@@ -25,13 +25,12 @@ endif()
 # Предпочтительные пути к утилитам для компоновки
 if(CMAKE_CXX_COMPILER_IS_GCC)
   # Astra Linux Smolensk 1.5
-  if(MYX_CMAKE_LSB_DISTRIBUTOR_ID STREQUAL "AstraLinuxSE"
+  if(MYX_CMAKE_LSB_DISTRIBUTOR_ID STREQUAL "AstraLinuxSE" AND
-     AND MYX_CMAKE_LSB_CODENAME STREQUAL "smolensk"
+     MYX_CMAKE_LSB_CODENAME STREQUAL "smolensk" AND
-     AND MYX_CMAKE_LSB_RELEASE STREQUAL "1.5")
+     MYX_CMAKE_LSB_RELEASE STREQUAL "1.5")
     find_program(CMAKE_GCC_AR NAMES "/usr/bin/x86_64-linux-gnu-gcc-ar-4.7")
     find_program(CMAKE_GCC_NM NAMES "/usr/bin/x86_64-linux-gnu-gcc-nm-4.7")
-    find_program(CMAKE_GCC_RANLIB
+    find_program(CMAKE_GCC_RANLIB NAMES "/usr/bin/x86_64-linux-gnu-gcc-ranlib-4.7")
-                 NAMES "/usr/bin/x86_64-linux-gnu-gcc-ranlib-4.7")
     # Elbrus E2K
   elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "e2k")
     find_program(CMAKE_GCC_AR
@@ -47,18 +46,12 @@ if(CMAKE_CXX_COMPILER_IS_GCC)
   endif()
 
   if(CMAKE_GCC_AR)
-    set(CMAKE_AR
+    set(CMAKE_AR ${CMAKE_GCC_AR} CACHE STRING "" FORCE)
-        ${CMAKE_GCC_AR}
-        CACHE STRING "" FORCE)
   endif()
   if(CMAKE_GCC_NM)
-    set(CMAKE_NM
+    set(CMAKE_NM ${CMAKE_GCC_NM} CACHE STRING "" FORCE)
-        ${CMAKE_GCC_NM}
-        CACHE STRING "" FORCE)
   endif()
   if(CMAKE_GCC_RANLIB)
-    set(CMAKE_RANLIB
+    set(CMAKE_RANLIB ${CMAKE_GCC_RANLIB} CACHE STRING "" FORCE)
-        ${CMAKE_GCC_RANLIB}
-        CACHE STRING "" FORCE)
   endif()
 endif()

MyxCMake/modules/MyxCMakeCompilerFlags.cmake

@@ -8,11 +8,11 @@ macro(CHECK_ENABLE_CXX_FLAG flag)
   unset(CMAKE_REQUIRED_QUIET)
 
   if(CHECK_CXX_FLAG)
-    message(STATUS "'${flag}': flag is supported.")
+    myx_cmake_message_notice("'${flag}': flag is supported.")
     string(CONCAT _MYX_CMAKE_DETECTED_CXX_FLAGS
                   "${_MYX_CMAKE_DETECTED_CXX_FLAGS} ${flag}")
   else()
-    message(STATUS "'${flag}': flag is NOT supported.")
+    myx_cmake_message_status("'${flag}': flag is NOT supported.")
   endif()
   # NOTE: check_cxx_compiler stores variables in the cache.
   unset(CHECK_CXX_FLAG CACHE)
@@ -25,11 +25,11 @@ macro(CHECK_ENABLE_DEBUG_CXX_FLAG flag)
     unset(CMAKE_REQUIRED_QUIET)
 
     if(CHECK_CXX_FLAG_DEBUG)
-      message(STATUS "'${flag}': debug flag is supported.")
+      myx_cmake_message_notice("'${flag}': debug flag is supported.")
       string(CONCAT _MYX_CMAKE_DETECTED_CXX_FLAGS_DEBUG
                     "${_MYX_CMAKE_DETECTED_CXX_FLAGS_DEBUG} ${flag}")
     else()
-      message(STATUS "'${flag}': debug flag is NOT supported.")
+      myx_cmake_message_status("'${flag}': debug flag is NOT supported.")
     endif()
     # NOTE: check_cxx_compiler stores variables in the cache.
     unset(CHECK_CXX_FLAG_DEBUG CACHE)

MyxCMake/modules/MyxCMakeDebugOutputOptions.cmake

@@ -6,13 +6,7 @@ option(MYX_CMAKE_WARNING_OUTPUT "Enable warning output" OFF)
 # Если сборка производится в режиме для отладки, то включаются флаги для
 # разрешения отладочной печати
 if(CMAKE_BUILD_TYPE STREQUAL Debug)
-  set(MYX_CMAKE_DEBUG_OUTPUT
+  set(MYX_CMAKE_DEBUG_OUTPUT   ON CACHE BOOL "" FORCE)
-      ON
+  set(MYX_CMAKE_INFO_OUTPUT    ON CACHE BOOL "" FORCE)
-      CACHE BOOL "" FORCE)
+  set(MYX_CMAKE_WARNING_OUTPUT ON CACHE BOOL "" FORCE)
-  set(MYX_CMAKE_INFO_OUTPUT
-      ON
-      CACHE BOOL "" FORCE)
-  set(MYX_CMAKE_WARNING_OUTPUT
-      ON
-      CACHE BOOL "" FORCE)
 endif()

MyxCMake/modules/MyxCMakeDistCC.cmake

@@ -2,12 +2,12 @@ find_program(DISTCC_EXECUTABLE distcc)
 mark_as_advanced(DISTCC_EXECUTABLE)
 if(DISTCC_EXECUTABLE)
   foreach(lang C CXX)
-    if(NOT DEFINED CMAKE_${lang}_COMPILER_LAUNCHER
+  # cmake-format: off
-       AND NOT CMAKE_${lang}_COMPILER MATCHES ".*/distcc$")
+    if(NOT DEFINED CMAKE_${lang}_COMPILER_LAUNCHER AND
-      message(STATUS "MyxCMake: distcc enabled for ${lang}")
+       NOT CMAKE_${lang}_COMPILER MATCHES ".*/distcc$")
-      set(CMAKE_${lang}_COMPILER_LAUNCHER
+      myx_cmake_message_notice("MyxCMake: distcc enabled for ${lang}")
-          ${DISTCC_EXECUTABLE}
+      set(CMAKE_${lang}_COMPILER_LAUNCHER ${DISTCC_EXECUTABLE} CACHE STRING "")
-          CACHE STRING "")
     endif()
+  # cmake-format: on
   endforeach()
 endif()

MyxCMake/modules/MyxCMakeFormatSources.cmake

@@ -1,42 +1,87 @@
+find_program(UNCRUSTIFY_EXE NAMES uncrustify)
+
+if(UNCRUSTIFY_EXE)
+  if(NOT EXISTS ${CMAKE_BINARY_DIR}/uncrustify-classheader.txt)
+    file(GENERATE OUTPUT ${CMAKE_BINARY_DIR}/uncrustify-classheader.txt CONTENT
+"/**
+ *  @class   $(fclass)
+ *  @brief   TODO
+ *  @details TODO
+ */")
+  endif()
+
+  if(NOT EXISTS ${CMAKE_BINARY_DIR}/uncrustify-filefooter.txt)
+    file(GENERATE OUTPUT ${CMAKE_BINARY_DIR}/uncrustify-filefooter.txt CONTENT
+    "// EOF $(filename)")
+  endif()
+
+  if(NOT EXISTS ${CMAKE_BINARY_DIR}/uncrustify-fileheader.txt)
+    file(GENERATE OUTPUT ${CMAKE_BINARY_DIR}/uncrustify-fileheader.txt CONTENT
+"/**
+ *  @file    $(filename)
+ *  @brief   TODO
+ *  @details TODO
+ */")
+  endif()
+
+  if(NOT EXISTS ${CMAKE_BINARY_DIR}/uncrustify-funcheader.txt)
+    file(GENERATE OUTPUT ${CMAKE_BINARY_DIR}/uncrustify-funcheader.txt CONTENT
+"/**
+ *  @fn $(fclass)::$(function)
+ *  $(javaparam)
+ *  @details TODO
+ */")
+  endif()
+endif()
+
+
 function(myx_cmake_format_sources target)
 
-  find_program(UNCRUSTIFY_EXE NAMES uncrustify)
+  if(NOT TARGET myx-cmake-format-sources)
-  if(UNCRUSTIFY_EXE)
+    add_custom_target(myx-cmake-format-sources)
+  endif()
+
   get_target_property(__sources ${target} SOURCES)
   list(FILTER __sources EXCLUDE REGEX "qrc_.*\\.cpp$")
   list(FILTER __sources EXCLUDE REGEX "moc_.*\\.cpp$")
   list(FILTER __sources EXCLUDE REGEX "ui_.*\\.h$")
 
-    if(NOT TARGET myx-cmake-format-sources)
+  if(UNCRUSTIFY_EXE)
-      add_custom_target(myx-cmake-format-sources)
+    if(NOT TARGET myx-cmake-format-sources-check)
+      add_custom_target(myx-cmake-format-sources-check)
     endif()
-    if(NOT TARGET myx-cmake-check-format-sources)
+    if(NOT TARGET myx-cmake-doc-doxygen-append-comments)
-      add_custom_target(myx-cmake-check-format-sources)
+      add_custom_target(myx-cmake-doc-doxygen-append-comments)
-    endif()
-    if(NOT TARGET myx-cmake-add-doxygen-comments)
-      add_custom_target(myx-cmake-add-doxygen-comments)
     endif()
 
     if(EXISTS ${CMAKE_SOURCE_DIR}/.uncrustify.cfg)
-      list(APPEND UNCRUSTIFY_OPTS -c ${CMAKE_SOURCE_DIR}/.uncrustify.cfg)
+      add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/uncrustify-${target}.cfg
+                         COMMAND ${UNCRUSTIFY_EXE} --update-config-with-doc
+                                                   -c ${CMAKE_SOURCE_DIR}/.uncrustify.cfg
+                                                   -o ${CMAKE_BINARY_DIR}/uncrustify-${target}.cfg)
+      list(APPEND UNCRUSTIFY_OPTS -c ${CMAKE_BINARY_DIR}/uncrustify-${target}.cfg)
     endif()
     # cmake-format: off
-    add_custom_target(${target}-check-format-sources-uncrustify
+    add_custom_target(${target}-format-sources-check-uncrustify
+      DEPENDS ${CMAKE_BINARY_DIR}/uncrustify-${target}.cfg
       COMMAND ${UNCRUSTIFY_EXE} ${UNCRUSTIFY_OPTS} --check ${__sources})
     list(APPEND UNCRUSTIFY_OPTS --replace --no-backup)
     add_custom_target(${target}-format-sources-uncrustify
+      DEPENDS ${CMAKE_BINARY_DIR}/uncrustify-${target}.cfg
       COMMAND ${UNCRUSTIFY_EXE} ${UNCRUSTIFY_OPTS} --mtime ${__sources})
-    add_custom_target(${target}-add-doxygen-comments-uncrustify
+
+    add_custom_target(${target}-doc-doxygen-append-comments
+      DEPENDS ${CMAKE_BINARY_DIR}/uncrustify-${target}.cfg
       COMMAND ${UNCRUSTIFY_EXE} ${UNCRUSTIFY_OPTS}
-      --set cmt_insert_file_header=fileheader.txt
+      --set cmt_insert_class_header=uncrustify-classheader.txt
-      --set cmt_insert_file_footer=filefooter.txt
+      --set cmt_insert_file_footer=uncrustify-filefooter.txt
-      --set cmt_insert_func_header=funcheader.txt
+      --set cmt_insert_file_header=uncrustify-fileheader.txt
-      --set cmt_insert_class_header=classheader.txt
+      --set cmt_insert_func_header=uncrustify-funcheader.txt
       --set cmt_insert_before_ctor_dtor=true ${__sources})
     # cmake-format: on
-    add_dependencies(myx-cmake-check-format-sources ${target}-check-format-sources-uncrustify)
     add_dependencies(myx-cmake-format-sources ${target}-format-sources-uncrustify)
-    add_dependencies(myx-cmake-add-doxygen-comments ${target}-add-doxygen-comments-uncrustify)
+    add_dependencies(myx-cmake-format-sources-check ${target}-format-sources-check-uncrustify)
+    add_dependencies(myx-cmake-doc-doxygen-append-comments ${target}-doc-doxygen-append-comments)
   else()
     message(STATUS "MyxCMake: uncrustify executable is not found")
   endif()
@@ -49,4 +94,9 @@ function(myx_cmake_format_sources target)
   else()
     message(STATUS "MyxCMake: dos2unix executable is not found")
   endif()
+
+  if(UNIX)
+    add_custom_target(${target}-format-sources-unexec COMMAND chmod -x ${__sources})
+    add_dependencies(myx-cmake-format-sources ${target}-format-sources-unexec)
+  endif()
 endfunction()

MyxCMake/modules/MyxCMakeGlobalFunctions.cmake

@@ -2,9 +2,7 @@
 function(myx_cmake_canonical_string in_string out_string)
   string(TOUPPER ${in_string} _arg_uppercase)
   string(REGEX REPLACE "[ -]" "_" _arg_fixed ${_arg_uppercase})
-  set(${out_string}
+  set(${out_string} ${_arg_fixed} PARENT_SCOPE)
-      ${_arg_fixed}
-      PARENT_SCOPE)
 endfunction()
 
 # Добавление общего префикса ко всем переменным в списке
@@ -13,7 +11,5 @@ function(myx_cmake_list_transform_prepend var prefix)
   foreach(filename ${${var}})
     list(APPEND temp "${prefix}${filename}")
   endforeach()
-  set(${var}
+  set(${var} ${temp} PARENT_SCOPE)
-      "${temp}"
-      PARENT_SCOPE)
 endfunction()

MyxCMake/modules/MyxCMakeGlobalVariables.cmake

@@ -14,16 +14,12 @@ string(TOLOWER ${MYX_CMAKE_THEME_NAME_CANONICAL} MYX_CMAKE_THEME_NAME_LOWER)
 string(TOUPPER ${MYX_CMAKE_ORGANIZATION_NAME_CANONICAL} MYX_CMAKE_ORGANIZATION_NAME_UPPER)
 string(TOUPPER ${MYX_CMAKE_PROJECT_NAME_CANONICAL} MYX_CMAKE_PROJECT_NAME_UPPER)
 string(TOUPPER ${MYX_CMAKE_THEME_NAME_CANONICAL} MYX_CMAKE_THEME_NAME_UPPER)
-# cmake-format: on
 
 option(MYX_CMAKE_ADD_THEME_PREFIX "Append theme name to install prefix" OFF)
 if(MYX_CMAKE_ADD_THEME_PREFIX AND NOT MYX_CMAKE_THEME_PREFIX_APPENDED)
   if(NOT MYX_CMAKE_THEME_NAME_LOWER STREQUAL "default")
-    set(MYX_CMAKE_THEME_PREFIX_APPENDED
+    set(MYX_CMAKE_THEME_PREFIX_APPENDED ON CACHE BOOL "" FORCE)
-        ON
+    set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/${MYX_CMAKE_THEME_NAME}" CACHE PATH "" FORCE)
-        CACHE BOOL "" FORCE)
-    set(CMAKE_INSTALL_PREFIX
-        "${CMAKE_INSTALL_PREFIX}/${MYX_CMAKE_THEME_NAME}"
-        CACHE PATH "" FORCE)
   endif()
 endif()
+# cmake-format: on

MyxCMake/modules/MyxCMakeLSBInfo.cmake

@@ -24,6 +24,6 @@ else()
     execute_process(COMMAND ${_lsb_release_executable} -si OUTPUT_VARIABLE MYX_CMAKE_LSB_DISTRIBUTOR_ID OUTPUT_STRIP_TRAILING_WHITESPACE)
     execute_process(COMMAND ${_lsb_release_executable} -sc OUTPUT_VARIABLE MYX_CMAKE_LSB_CODENAME OUTPUT_STRIP_TRAILING_WHITESPACE)
     execute_process(COMMAND ${_lsb_release_executable} -sr OUTPUT_VARIABLE MYX_CMAKE_LSB_RELEASE OUTPUT_STRIP_TRAILING_WHITESPACE)
-  # cmake-format: on
   endif()
+  # cmake-format: on
 endif()

MyxCMake/modules/MyxCMakePaths.cmake

@@ -0,0 +1,9 @@
+if(MYX_CMAKE_LSB_DISTRIBUTOR_ID STREQUAL "AstraLinuxSE" OR
+    MYX_CMAKE_LSB_DISTRIBUTOR_ID STREQUAL "AstraLinuxCE")
+  set(CMAKE_37_MODULES_DIR "/usr/share/cmake-3.7/Modules")
+  if(IS_DIRECTORY ${CMAKE_37_MODULES_DIR})
+    if(NOT ${CMAKE_37_MODULES_DIR} IN_LIST CMAKE_MODULE_PATH)
+      list(APPEND CMAKE_MODULE_PATH ${CMAKE_37_MODULES_DIR})
+    endif()
+  endif()
+endif()

MyxCMake/modules/MyxCMakePkgConfig.cmake

@@ -16,27 +16,27 @@ function(myx_cmake_generate_pkgconfig target)
   get_target_property(__target_type ${target} TYPE)
   if(__target_type STREQUAL INTERFACE_LIBRARY)
     file(
-      WRITE "${CMAKE_BINARY_DIR}/${BASENAME}.pc"
+      WRITE "${CMAKE_BINARY_DIR}/${ARG_BASENAME}.pc"
       "prefix=${CMAKE_INSTALL_PREFIX}\n"
       "exec_prefix=${CMAKE_INSTALL_PREFIX}\n"
       "includedir=${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}\n"
       "\n"
-      "Name: ${BASENAME}\n"
+      "Name: ${ARG_BASENAME}\n"
-      "Description: ${BASENAME} header-only library\n"
+      "Description: ${ARG_BASENAME} header-only library\n"
       "Version: ${PROJECT_VERSION}\n"
       "\n"
       "Requires:\n"
       "Cflags: -I${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}\n")
   else()
     file(
-      WRITE "${CMAKE_BINARY_DIR}/${BASENAME}.pc"
+      WRITE "${CMAKE_BINARY_DIR}/${ARG_BASENAME}.pc"
       "prefix=${CMAKE_INSTALL_PREFIX}\n"
       "exec_prefix=${CMAKE_INSTALL_PREFIX}\n"
       "libdir=${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}\n"
       "includedir=${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}\n"
       "\n"
-      "Name: ${BASENAME}\n"
+      "Name: ${ARG_BASENAME}\n"
-      "Description: ${BASENAME} library\n"
+      "Description: ${ARG_BASENAME} library\n"
       "Version: ${PROJECT_VERSION}\n"
       "\n"
       "Requires:\n"
@@ -44,7 +44,7 @@ function(myx_cmake_generate_pkgconfig target)
       "Cflags: -I${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}\n")
   endif()
   install(
-    FILES "${CMAKE_BINARY_DIR}/${BASENAME}.pc"
+    FILES "${CMAKE_BINARY_DIR}/${ARG_BASENAME}.pc"
     COMPONENT ${ARG_COMPONENT}
     DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
 endfunction()

MyxCMake/modules/MyxCMakePrecompiledHeaders.cmake

@@ -1,10 +1,10 @@
+# cmake-format: off
 if(${CMAKE_VERSION} VERSION_LESS "3.16.0")
   include(cotire OPTIONAL)
   if(COMMAND cotire)
-    option(MYX_CMAKE_PRECOMPILED_HEADERS "MyxCMake: enable precompiled headers"
+    option(MYX_CMAKE_PRECOMPILED_HEADERS "MyxCMake: enable precompiled headers" OFF)
-           OFF)
   endif()
 else()
-  option(MYX_CMAKE_PRECOMPILED_HEADERS "MyxCMake: enable precompiled headers"
+  option(MYX_CMAKE_PRECOMPILED_HEADERS "MyxCMake: enable precompiled headers" OFF)
-         OFF)
 endif()
+# cmake-format: on

MyxCMake/modules/MyxCMakeProjectVersion.cmake

@@ -1,17 +1,15 @@
 function(myx_cmake_check_project_version)
   if(NOT ${PROJECT_VERSION_PATCH} MATCHES "([0-9]+)")
-    message(FATAL_ERROR "MyxCMake: Please set project version in X.Y.Z format")
+    myx_cmake_message_error("MyxCMake: Please set project version in X.Y.Z format")
   endif()
 endfunction()
 
 function(myx_cmake_set_project_version_int)
+  # cmake-format: off
   myx_cmake_check_project_version()
-  math(
+  math(EXPR _version_int "(${PROJECT_VERSION_MAJOR} << 16) + (${PROJECT_VERSION_MINOR} << 8) + ${PROJECT_VERSION_PATCH}")
-    EXPR
-    _version_int
-    "(${PROJECT_VERSION_MAJOR} << 16) + (${PROJECT_VERSION_MINOR} << 8) + ${PROJECT_VERSION_PATCH}"
-  )
   set_property(GLOBAL PROPERTY PROJECT_VERSION_INT ${_version_int})
+  # cmake-format: on
 endfunction()
 
 myx_cmake_set_project_version_int()

MyxCMake/modules/MyxCMakeRequiredVariables.cmake

@@ -3,32 +3,25 @@
 # CMakeLists.txt до подключения MyxCMake, либо передать из командной строки
 # через ключ -D
 #
+
+# cmake-format: off
 if(NOT MYX_CMAKE_ORGANIZATION_NAME)
-  message(
+  myx_cmake_message_error("MyxCMake: Required variable MYX_CMAKE_ORGANIZATION_NAME is not defined")
-    FATAL_ERROR
-      "MyxCMake: Required variable MYX_CMAKE_ORGANIZATION_NAME is not defined")
 endif()
 
 if(NOT MYX_CMAKE_AUTHOR_NAME)
-  message(
+  myx_cmake_message_error("MyxCMake: Required variable MYX_CMAKE_AUTHOR_NAME is not defined")
-    FATAL_ERROR
-      "MyxCMake: Required variable MYX_CMAKE_AUTHOR_NAME is not defined")
 endif()
 
 if(NOT MYX_CMAKE_AUTHOR_EMAIL)
-  message(
+  myx_cmake_message_error("MyxCMake: Required variable MYX_CMAKE_AUTHOR_EMAIL is not defined")
-    FATAL_ERROR
-      "MyxCMake: Required variable MYX_CMAKE_AUTHOR_EMAIL is not defined")
 endif()
-set(CPACK_PACKAGE_CONTACT
-    "${MYX_CMAKE_AUTHOR_NAME} <${MYX_CMAKE_AUTHOR_EMAIL}>"
-    CACHE STRING "")
 
 if(NOT MYX_CMAKE_DESCRIPTION)
-  message(
+  myx_cmake_message_error("MyxCMake: Required variable MYX_CMAKE_DESCRIPTION is not defined")
-    FATAL_ERROR
-      "MyxCMake: Required variable MYX_CMAKE_DESCRIPTION is not defined")
 endif()
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY
+
-    ${MYX_CMAKE_DESCRIPTION}
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY ${MYX_CMAKE_DESCRIPTION} CACHE STRING "")
-    CACHE STRING "")
+set(CPACK_PACKAGE_CONTACT "${MYX_CMAKE_AUTHOR_NAME} <${MYX_CMAKE_AUTHOR_EMAIL}>" CACHE STRING "")
+# cmake-format: on
+

MyxCMake/thirdparty/PVS-Studio.cmake

@@ -3,7 +3,7 @@
 #
 # Version 12
 
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.0.0)
 cmake_policy(SET CMP0054 NEW)
 
 if (PVS_STUDIO_AS_SCRIPT)
@@ -32,6 +32,7 @@ if (PVS_STUDIO_AS_SCRIPT)
         endif ()
     endforeach ()
     
+    file(REMOVE "${PVS_STUDIO_LOG_FILE}")
     execute_process(COMMAND ${PVS_STUDIO_COMMAND} ${additional_args}
                     RESULT_VARIABLE result
                     OUTPUT_VARIABLE output
@@ -58,13 +59,17 @@ function (pvs_studio_log TEXT)
 endfunction ()
 
 function (pvs_studio_relative_path VAR ROOT FILEPATH)
+    if (WIN32)
+        STRING(REGEX REPLACE "\\\\" "/" ROOT ${ROOT})
+        STRING(REGEX REPLACE "\\\\" "/" FILEPATH ${FILEPATH})
+    endif()
     set("${VAR}" "${FILEPATH}" PARENT_SCOPE)
-    if ("${FILEPATH}" MATCHES "^/.*$" OR "${FILEPATH}" MATCHES "^.:/.*$")
+    if (IS_ABSOLUTE "${FILEPATH}")
         file(RELATIVE_PATH RPATH "${ROOT}" "${FILEPATH}")
-        if (NOT "${RPATH}" MATCHES "^\\.\\..*$")
+        if (NOT IS_ABSOLUTE "${RPATH}")
             set("${VAR}" "${RPATH}" PARENT_SCOPE)
-        endif ()
+        endif()
-    endif ()
+    endif()
 endfunction ()
 
 function (pvs_studio_join_path VAR DIR1 DIR2)
@@ -96,7 +101,7 @@ macro (pvs_studio_append_flags_from_property CXX C DIR PREFIX)
 endmacro ()
 
 macro (pvs_studio_append_standard_flag FLAGS STANDARD)
-    if ("${STANDARD}" MATCHES "^(99|11|14|17)$")
+    if ("${STANDARD}" MATCHES "^(99|11|14|17|20)$")
         if ("${PVS_STUDIO_PREPROCESSOR}" MATCHES "gcc|clang")
             list(APPEND "${FLAGS}" "-std=c++${STANDARD}")
         endif ()
@@ -205,8 +210,9 @@ function (pvs_studio_analyze_file SOURCE SOURCE_DIR BINARY_DIR)
 
         string(REPLACE ";" "$<SEMICOLON>" cmdline "${cmdline}")
         set(pvscmd "${CMAKE_COMMAND}"
-                   -D PVS_STUDIO_AS_SCRIPT=TRUE
+                   -D "PVS_STUDIO_AS_SCRIPT=TRUE"
                    -D "PVS_STUDIO_COMMAND=${cmdline}"
+                   -D "PVS_STUDIO_LOG_FILE=${LOG}"
                    -P "${PVS_STUDIO_SCRIPT}"
         )
 
@@ -513,10 +519,14 @@ function (pvs_studio_add_target)
             if ("${PVS_STUDIO_FORMAT}" STREQUAL "")
                 set(PVS_STUDIO_FORMAT "errorfile")
             endif ()
+            set(converter_no_help "")
+            if (PVS_STUDIO_HIDE_HELP)
+              set(converter_no_help "--noHelpMessages")
+            endif()
             list(APPEND COMMANDS
                 COMMAND "${CMAKE_COMMAND}" -E remove -f "${PVS_STUDIO_LOG}.pvs.raw"
                 COMMAND "${CMAKE_COMMAND}" -E rename "${PVS_STUDIO_LOG}" "${PVS_STUDIO_LOG}.pvs.raw"
-                COMMAND "${PVS_STUDIO_CONVERTER}" "${PVS_STUDIO_CONVERTER_ARGS}" -t "${PVS_STUDIO_FORMAT}" "${PVS_STUDIO_LOG}.pvs.raw" -o "${PVS_STUDIO_LOG}" -a "${PVS_STUDIO_MODE}"
+                COMMAND "${PVS_STUDIO_CONVERTER}" "${PVS_STUDIO_CONVERTER_ARGS}" ${converter_no_help} -t "${PVS_STUDIO_FORMAT}" "${PVS_STUDIO_LOG}.pvs.raw" -o "${PVS_STUDIO_LOG}" -a "${PVS_STUDIO_MODE}"
                 )
             if(NOT PVS_STUDIO_KEEP_COMBINED_PLOG)
                 list(APPEND COMMANDS COMMAND "${CMAKE_COMMAND}" -E remove -f "${PVS_STUDIO_LOG}.pvs.raw")
@@ -544,9 +554,7 @@ function (pvs_studio_add_target)
     endif ()
 
     if (PVS_STUDIO_OUTPUT)
-        if (PVS_STUDIO_HIDE_HELP AND NOT WIN32)
+        if (WIN32)
-            set(COMMANDS COMMAND grep -v " error: Help:" ${PVS_STUDIO_LOG} 1>&2 || exit 0)
-        elseif (WIN32)
             set(COMMANDS COMMAND type "${PVS_STUDIO_LOG}" 1>&2)
         else ()
             set(COMMANDS COMMAND cat "${PVS_STUDIO_LOG}" 1>&2)
@@ -555,9 +563,25 @@ function (pvs_studio_add_target)
         set(COMMANDS "")
     endif ()
 
+    set(props_file "${CMAKE_BINARY_DIR}/${PVS_STUDIO_TARGET}.user.props")
+    file(WRITE "${props_file}" [=[
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ImportGroup Label="PropertySheets">
+  <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ItemDefinitionGroup>
+  <CustomBuild>
+   <BuildInParallel>true</BuildInParallel>
+  </CustomBuild>
+ </ItemDefinitionGroup>
+</Project>
+]=])
+
     add_custom_target("${PVS_STUDIO_TARGET}" ${ALL} ${COMMANDS} 
                       WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" 
                       DEPENDS ${PVS_STUDIO_DEPENDS} "${PVS_STUDIO_LOG}")
+    set_target_properties("${PVS_STUDIO_TARGET}" PROPERTIES VS_USER_PROPS "${props_file}")
 
     # A workaround to add implicit dependencies of source files from include directories
     set_target_properties("${PVS_STUDIO_TARGET}" PROPERTIES INCLUDE_DIRECTORIES "${inc_path}")

build_deb.sh

@@ -3,16 +3,19 @@
 set -e
 
 V=$(grep -i "project.*VERSION.*LANGUAGES" CMakeLists.txt | sed 's/.*VERSION \([0-9.]*\) .*/\1/')
-D=$(mktemp -d "/tmp/myx-cmake.XXXXXX")
+D=build
+
 mkdir -p "$D/myx-cmake-$V"
 cp -ap CMakeLists.txt MyxCMake "$D/myx-cmake-$V"
 pushd "$D"
 tar Jcf "myx-cmake_${V}.orig.tar.xz" "myx-cmake-$V"
 popd
+
 cp -ap debian "$D/myx-cmake-$V"
 pushd "$D/myx-cmake-$V"
 dch -D unstable -v "${V}-1" -m "New version."
-debuild --no-sign
+dpkg-buildpackage -us -uc
 popd
-cp -f ${D}/myx*deb .
+
+rm -rf "$D/myx-cmake-$V"
 

debian/compat

@@ -0,0 +1 @@
+9

debian/control

@@ -2,7 +2,7 @@ Source: myx-cmake
 Section: utils
 Priority: optional
 Maintainer: Andrey Astafyev <dev@246060.ru>
-Build-Depends: debhelper (>= 9), debhelper-compat (= 9), cmake
+Build-Depends: debhelper (>= 9), cmake
 Standards-Version: 4.2.0
 
 Package: myx-cmake