QT_VERSION_STR для старых версий Qt

Совместимость с Смоленск 1.5
CI/CD
2024-04-08 22:38:24 +03:00 · 2024-04-08 22:27:13 +03:00 · 2024-04-08 22:22:02 +03:00 · 2024-04-08 21:48:29 +03:00 · 2024-03-28 11:08:34 +03:00 · 2023-08-17 12:18:38 +03:00
35 changed files with 676 additions and 451 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -0,0 +1,38 @@
+---
+include:
+  - project: 'cicd/gitlab'
+    ref: master
+    file: 'gitlab.yml'
+
+uncrustify:
+  extends:
+    - .test-formatting-with-uncrustify
+
+build-smolensk15:
+  extends:
+    - .image-smolensk15-large
+    - .build-cmake-make
+
+build-smolensk16:
+  extends:
+    - .image-smolensk16-large
+    - .build-cmake-make
+
+build-smolensk17:
+  extends:
+    - .image-smolensk16-large
+    - .build-cmake-make
+
+build-with-modern-clang:
+  extends:
+    - .use-clang-18
+    - .image-noble-large
+    - .build-cmake-ninja
+
+analyze-clang-tidy:
+  extends:
+    - .cmake-analyze-clang-tidy
+
+analyze-pvs-studio:
+  extends:
+    - .cmake-analyze-pvs-studio
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -5,15 +5,15 @@ cmake_minimum_required(VERSION 3.6 FATAL_ERROR)
 cmake_policy(VERSION 3.6..3.7)

 # Название и версия проекта и используемые языки программирования
-project(myx-example-qt5-console VERSION 0.4.0 LANGUAGES C CXX)
+project(myx-example-qt-console VERSION 0.4.0 LANGUAGES C CXX)
+
+set(CMAKE_CXX_STANDARD 11)

 # Рекомендуемый способ подключения MyxCMake
 include(cmake/myx_setup.cmake)

-# Поиск пакетов
-myx_find_required_packages(
-  Qt5 Core
-  Qt5Private Core)
+# Поиск компонентов Qt
+myx_find_qt(COMPONENTS Core PRIVATE Core REQUIRED)

 # Цель для создания исполняемого файла
 myx_add_executable(${PROJECT_NAME})
@ -25,7 +25,7 @@ myx_target_setup(${PROJECT_NAME}
 )

 # Настройка Qt для цели
-myx_qt5_target_setup(${PROJECT_NAME}
+myx_target_setup_qt(${PROJECT_NAME}
  COMPONENTS Core
  PRIVATE Core)

--- a/cmake/myx/MyxCMakeConfig.cmake
+++ b/cmake/myx/MyxCMakeConfig.cmake
@ -24,8 +24,7 @@ set(MYX_CMAKE_LIB_DIR "${MYX_CMAKE_SOURCE_DIR}/lib")

 # Модули для обеспечения обратной совместимости со старыми версиями CMake
 include(${MYX_CMAKE_BACKPORTS_DIR}/IncludeGuard.cmake)
-include(${MYX_CMAKE_BACKPORTS_DIR}/TopLevelProject.cmake)
-if(${CMAKE_VERSION} VERSION_LESS "3.11.0")
+if(${CMAKE_VERSION} VERSION_LESS 3.11)
  include(${MYX_CMAKE_BACKPORTS_DIR}/FetchContent.cmake)
 else()
  include(FetchContent)
@ -38,11 +37,13 @@ include(CMakeDependentOption)
 # Полезные макросы
 include(${MYX_CMAKE_LIB_DIR}/macro/CreateSymlink.cmake)
 include(${MYX_CMAKE_LIB_DIR}/macro/FindPackages.cmake)
+include(${MYX_CMAKE_LIB_DIR}/macro/FindQt.cmake)
 include(${MYX_CMAKE_LIB_DIR}/macro/InstallRelative.cmake)
 include(${MYX_CMAKE_LIB_DIR}/macro/CheckEnableCxxCompilerFlag.cmake)
 include(${MYX_CMAKE_LIB_DIR}/macro/GTest.cmake)
 include(${MYX_CMAKE_LIB_DIR}/macro/QTest.cmake)

+include(${MYX_CMAKE_LIB_DIR}/ProjectIsTopLevel.cmake)
 include(${MYX_CMAKE_LIB_DIR}/ColoredMessages.cmake)
 include(${MYX_CMAKE_LIB_DIR}/PopulateCMakeBinaryDir.cmake)
 include(${MYX_CMAKE_LIB_DIR}/CurrentDate.cmake)
@ -50,18 +51,14 @@ include(${MYX_CMAKE_LIB_DIR}/NinjaGeneratorWarning.cmake)
 include(${MYX_CMAKE_LIB_DIR}/DirectoriesGuards.cmake)
 include(${MYX_CMAKE_LIB_DIR}/SemanticProjectVersion.cmake)
 include(${MYX_CMAKE_LIB_DIR}/NinjaGeneratorWrapper.cmake)
-include(${MYX_CMAKE_LIB_DIR}/AddExternalTarget.cmake)
-include(${MYX_CMAKE_LIB_DIR}/FetchContentAdd.cmake)
+include(${MYX_CMAKE_LIB_DIR}/DownloadContent.cmake)

-set(MYX_CMAKE_TOOLCHAINS_DIR "${MYX_CMAKE_LIB_DIR}/toolchains")
 include(${MYX_CMAKE_LIB_DIR}/Toolchains.cmake)
-unset(MYX_CMAKE_TOOLCHAINS_DIR)
-
 include(${MYX_CMAKE_LIB_DIR}/AddExecutable.cmake)
 include(${MYX_CMAKE_LIB_DIR}/AddInterfaceLibrary.cmake)
 include(${MYX_CMAKE_LIB_DIR}/AddObjectLibrary.cmake)
 include(${MYX_CMAKE_LIB_DIR}/TargetSetup.cmake)
-include(${MYX_CMAKE_LIB_DIR}/Qt5TargetSetup.cmake)
+include(${MYX_CMAKE_LIB_DIR}/TargetSetupQt.cmake)

 include(${MYX_CMAKE_LIB_DIR}/uncrustify/Uncrustify.cmake)
 include(${MYX_CMAKE_LIB_DIR}/doc/Doxygen.cmake)
--- a/cmake/myx/MyxCMakeConfigVersion.cmake
+++ b/cmake/myx/MyxCMakeConfigVersion.cmake
@ -1,4 +1,4 @@
-set(MYX_CMAKE_PACKAGE_VERSION "2.3.8")
+set(MYX_CMAKE_PACKAGE_VERSION "2.4.37")
 if(MYX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
  set(PACKAGE_VERSION_COMPATIBLE FALSE)
 else()
--- a/cmake/myx/backports/TopLevelProject.cmake
+++ b/cmake/myx/backports/TopLevelProject.cmake
@ -1,11 +0,0 @@
-include_guard(GLOBAL)
-
-if(${CMAKE_VERSION} VERSION_LESS 3.21)
-  get_property(__parent_directory DIRECTORY PROPERTY PARENT_DIRECTORY)
-  if(NOT __parent_directory)
-    set(PROJECT_IS_TOP_LEVEL TRUE)
-  else()
-    set(PROJECT_IS_TOP_LEVEL FALSE)
-  endif()
-  unset(__parent_directory)
-endif()
--- a/cmake/myx/lib/AddExecutable.cmake
+++ b/cmake/myx/lib/AddExecutable.cmake
@ -14,7 +14,7 @@ myx_add_executable
 include_guard(GLOBAL)

 function(myx_add_executable TARGET_NAME)
-  if(${CMAKE_VERSION} VERSION_LESS "3.11.0")
+  if(${CMAKE_VERSION} VERSION_LESS 3.11.0)
    add_executable(${TARGET_NAME} ${ARGN} "")
  else()
    add_executable(${TARGET_NAME} ${ARGN})
--- a/cmake/myx/lib/AddExternalTarget.cmake
+++ b/cmake/myx/lib/AddExternalTarget.cmake
@ -1,79 +0,0 @@
-#[=======================================================================[.rst:
-myx_add_external_target
-----------------------
-
-Функция для подключения целей из внешних проектов::
-
-  myx_add_external_target(TARGET_NAME
-    [ MODULES_PATH modules_path ] |
-    [ GIT_REPOSITORY url ] |
-    [ GIT_TAG tag ] |
-    [ LOCAL_PATH local_path ] )
-
-Обязательный параметр: `TARGET_NAME` - имя цели, содержащейся во внешнем проекте.
-Параметр `MODULES_PATH` содержит имя каталога, в который будут загружаться
-внешние проекты (по умолчанию `modules`). Параметр `GIT_REPOSITORY` содержит
-адрес внешнего проекта, который нужно загрузить с помощью git. Параметр `GIT_TAG`
-содержит используемые метку, идентификатор коммита или ветку в репозитории.
-Параметр `LOCAL_PATH` используется для указания пути к подкаталогу, находящемуся
-вне текущего проекта. Его следует указывать только при вызове функции из
-вспомогательного файла `external_targets.cmake`.
-
-#]=======================================================================]
-
-
-find_package(Git)
-
-function(myx_add_external_target TARGET_NAME)
-  set(options)
-  set(oneValueArgs)
-  set(multiValueArgs MODULES_PATH GIT_REPOSITORY GIT_TAG LOCAL_PATH)
-  cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
-  if(TARGET ${TARGET_NAME})
-    return()
-  endif()
-
-  if(ARG_LOCAL_PATH)
-    myx_message_notice("Using directory ${ARG_LOCAL_PATH} to build target ${TARGET_NAME}")
-    add_subdirectory(${ARG_LOCAL_PATH} ${CMAKE_BINARY_DIR}/${TARGET_NAME} EXCLUDE_FROM_ALL)
-    return()
-  endif()
-
-  if(NOT ARG_MODULES_PATH)
-    set(ARG_MODULES_PATH modules)
-  endif()
-
-  if(CMAKE_SCRIPT_MODE_FILE)
-    set(PROJECT_SOURCE_DIR ${CMAKE_SOURCE_DIR})
-  endif()
-  set(ARG_MODULES_PATH ${PROJECT_SOURCE_DIR}/${ARG_MODULES_PATH})
-
-  if(NOT IS_DIRECTORY ${ARG_MODULES_PATH})
-    execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${ARG_MODULES_PATH})
-  endif()
-
-  if(GIT_EXECUTABLE)
-    if(NOT IS_DIRECTORY ${ARG_MODULES_PATH}/${TARGET_NAME})
-      execute_process(COMMAND ${GIT_EXECUTABLE} clone ${ARG_GIT_REPOSITORY} ${TARGET_NAME}
-        WORKING_DIRECTORY ${ARG_MODULES_PATH})
-    else()
-      execute_process(COMMAND ${GIT_EXECUTABLE} fetch
-        WORKING_DIRECTORY ${ARG_MODULES_PATH}/${TARGET_NAME})
-    endif()
-    execute_process(COMMAND ${GIT_EXECUTABLE} checkout ${ARG_GIT_TAG}
-      WORKING_DIRECTORY ${ARG_MODULES_PATH}/${TARGET_NAME})
-  endif()
-
-  if(NOT CMAKE_SCRIPT_MODE_FILE)
-    add_subdirectory(${ARG_MODULES_PATH}/${TARGET_NAME} EXCLUDE_FROM_ALL)
-  endif()
-
-  if(NOT TARGET ${TARGET_NAME})
-    myx_message_fatal_error("Target ${TARGET_NAME} is not found.")
-  endif()
-
-endfunction(myx_add_external_target)
-
-include("${PROJECT_SOURCE_DIR}/external_targets.cmake" OPTIONAL)
-
--- a/cmake/myx/lib/AddInterfaceLibrary.cmake
+++ b/cmake/myx/lib/AddInterfaceLibrary.cmake
@ -20,12 +20,12 @@ include_guard(GLOBAL)

 include(CMakePackageConfigHelpers)

-if(${CMAKE_VERSION} VERSION_LESS "3.17.0")
+if(${CMAKE_VERSION} VERSION_LESS 3.17)
  set(MYX_CMAKE_LIB_DIR_BACKPORT "${CMAKE_CURRENT_LIST_DIR}")
 endif()

 function(myx_add_interface_library TARGET_NAME)
-  if(${CMAKE_VERSION} VERSION_LESS "3.17.0")
+  if(${CMAKE_VERSION} VERSION_LESS 3.17)
    set(CMAKE_CURRENT_FUNCTION_LIST_DIR ${MYX_CMAKE_LIB_DIR_BACKPORT})
  endif()

@ -43,42 +43,61 @@ function(myx_add_interface_library TARGET_NAME)
  endif()

  # Вызов стандартной функции `add_library()`
-  if(${CMAKE_VERSION} VERSION_LESS "3.19.0")
+  if(${CMAKE_VERSION} VERSION_LESS 3.19)
    add_library(${TARGET_NAME} INTERFACE)
    target_sources(${TARGET_NAME} INTERFACE $<BUILD_INTERFACE:${ARG_HEADERS}>)
  else()
    add_library(${TARGET_NAME} INTERFACE ${ARG_HEADERS})
  endif()

-  foreach(__iter ${ARG_PACKAGES})
-    target_include_directories(${TARGET_NAME} INTERFACE ${${__iter}_INCLUDE_DIRS})
-    target_compile_definitions(${TARGET_NAME} INTERFACE ${${__iter}_COMPILE_DEFINITIONS})
+  foreach(iter ${ARG_PACKAGES})
+    target_include_directories(${TARGET_NAME} INTERFACE ${${iter}_INCLUDE_DIRS})
+    target_compile_definitions(${TARGET_NAME} INTERFACE ${${iter}_COMPILE_DEFINITIONS})
  endforeach()

  if(ARG_LINK_LIBRARIES)
-    target_link_libraries(${TARGET_NAME} INTERFACE ${ARG_LINK_LIBRARIES})
-    if(${CMAKE_VERSION} VERSION_GREATER "3.15.0")
-      foreach(__lib ${ARG_LINK_LIBRARIES})
-        if(TARGET ${__lib})
-          install(
-            TARGETS ${__lib}
+    foreach(lib ${ARG_LINK_LIBRARIES})
+      if(TARGET ${lib})
+        set(exlib ${lib})
+        get_target_property(type ${lib} TYPE)
+        if(type)
+          get_target_property(include_dirs ${lib} INTERFACE_INCLUDE_DIRECTORIES)
+          if(include_dirs)
+            target_include_directories(${TARGET_NAME} INTERFACE ${include_dirs})
+          endif()
+        endif()
+        if(${CMAKE_VERSION} VERSION_GREATER 3.13)
+          install(TARGETS ${lib}
                  EXPORT ${TARGET_NAME}Targets
                  COMPONENT DEV)
+        else()
+          get_target_property(target_type ${lib} TYPE)
+          if(target_type STREQUAL "OBJECT_LIBRARY")
+            if(TARGET "${lib}_static")
+              set(exlib "${lib}_static")
+            elseif(TARGET "${lib}_shared")
+              set(exlib "${lib}_shared")
+            endif()
+          endif()
+        endif()
+        target_link_libraries(${TARGET_NAME} INTERFACE ${exlib})
      endif()
    endforeach()
  endif()
-  endif()

  # Библиотека, состоящая только из заголовочных файлов не требует сборки.
  # Стандартные пути к заголовочным файлам
-  target_include_directories(${TARGET_NAME} INTERFACE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>)
+  target_include_directories(${TARGET_NAME} INTERFACE
+    $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
+    $<INSTALL_INTERFACE:include>
+  )

  # Если вызов был выполнен не из проекта верхнего уровня,
  # то созданная цель исключается из цели `all`.
  # При этом сама цель `${TARGET_NAME}` может участвовать в сборке,
  # если окажется в перечне зависимостей.
  if(NOT PROJECT_IS_TOP_LEVEL)
-    if(${CMAKE_VERSION} VERSION_GREATER "3.17.0")
+    if(${CMAKE_VERSION} VERSION_GREATER 3.17)
      set_target_properties(${TARGET_NAME} PROPERTIES EXCLUDE_FROM_ALL True)
    else()
      set_target_properties(${TARGET_NAME} PROPERTIES INTERFACE_EXCLUDE_FROM_ALL True)
@ -103,9 +122,12 @@ function(myx_add_interface_library TARGET_NAME)
    NO_CHECK_REQUIRED_COMPONENTS_MACRO
  )

-  install(EXPORT ${TARGET_NAME}Targets
+  if(${CMAKE_VERSION} VERSION_GREATER 3.13)
+    install(
+      EXPORT ${TARGET_NAME}Targets
      DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${TARGET_NAME}
      COMPONENT DEV)
+  endif()

  install(
    FILES
@ -135,10 +157,12 @@ function(myx_add_interface_library TARGET_NAME)

  # Установка библиотеки из заголовочных файлов
  target_include_directories(${TARGET_NAME} SYSTEM INTERFACE $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+  if(${CMAKE_VERSION} VERSION_GREATER 3.13)
    install(
      TARGETS ${TARGET_NAME}
      EXPORT ${TARGET_NAME}Targets
      COMPONENT DEV)
+  endif()

  # Установка публичных заголовочных файлов
  if(PROJECT_IS_TOP_LEVEL AND ARG_HEADERS)
--- a/cmake/myx/lib/AddObjectLibrary.cmake
+++ b/cmake/myx/lib/AddObjectLibrary.cmake
@ -21,12 +21,12 @@ myx_add_object_library

 include_guard(GLOBAL)

-if(${CMAKE_VERSION} VERSION_LESS "3.17.0")
+if(${CMAKE_VERSION} VERSION_LESS 3.17)
  set(MYX_CMAKE_LIB_DIR_BACKPORT "${CMAKE_CURRENT_LIST_DIR}")
 endif()

 function(myx_add_object_library TARGET_NAME)
-  if(${CMAKE_VERSION} VERSION_LESS "3.17.0")
+  if(${CMAKE_VERSION} VERSION_LESS 3.17)
    set(CMAKE_CURRENT_FUNCTION_LIST_DIR ${MYX_CMAKE_LIB_DIR_BACKPORT})
  endif()

@ -44,12 +44,12 @@ function(myx_add_object_library TARGET_NAME)
  # Вызов стандартной функции `add_library()`
  add_library(${TARGET_NAME} OBJECT ${ARG_UNPARSED_ARGUMENTS})

-  string(TOUPPER ${TARGET_NAME} __project_name_upper)
+  string(TOUPPER ${TARGET_NAME} project_name_upper)
  # Опция для разрешения сборки динамической библиотеки
-  cmake_dependent_option(${__project_name_upper}_BUILD_SHARED
+  cmake_dependent_option(${project_name_upper}_BUILD_SHARED
    "Build shared library for ${TARGET_NAME}" ON "BUILD_SHARED_LIBS" OFF)
  # Опция для разрешения сборки статической библиотеки
-  cmake_dependent_option(${__project_name_upper}_BUILD_STATIC
+  cmake_dependent_option(${project_name_upper}_BUILD_STATIC
    "Build static library for ${TARGET_NAME}" ON "NOT BUILD_SHARED_LIBS" OFF)

  # Стандартные пути к заголовочным файлам
@ -68,7 +68,7 @@ function(myx_add_object_library TARGET_NAME)
  if(NOT ARG_NO_EXPORT)
    include(GenerateExportHeader)
    if(NOT EXPORT_BASE_NAME)
-      set(ARG_EXPORT_BASE_NAME ${__project_name_upper})
+      set(ARG_EXPORT_BASE_NAME ${project_name_upper})
    endif()

    if(NOT ARG_EXPORT_FILE_NAME)
@ -89,7 +89,7 @@ function(myx_add_object_library TARGET_NAME)
  endif()

  # Цель для создания динамической библиотеки из объектных файлов
-  if(${__project_name_upper}_BUILD_SHARED)
+  if(${project_name_upper}_BUILD_SHARED)
    # Для создания динамической библиотеки используются объектные файлы цели ${TARGET_NAME}
    add_library(${TARGET_NAME}_shared SHARED $<TARGET_OBJECTS:${TARGET_NAME}>)
    # Установка дополнительных свойств для цели ${TARGET_NAME}_shared
@ -105,7 +105,7 @@ function(myx_add_object_library TARGET_NAME)
  endif()

  # Цель для создания статической библиотеки из объектных файлов
-  if(${__project_name_upper}_BUILD_STATIC)
+  if(${project_name_upper}_BUILD_STATIC)
    # Для создания статической библиотеки используются
    # объектные файлы цели ${TARGET_NAME}
    add_library(${TARGET_NAME}_static STATIC $<TARGET_OBJECTS:${TARGET_NAME}>)
--- a/cmake/myx/lib/DownloadContent.cmake
+++ b/cmake/myx/lib/DownloadContent.cmake
@ -0,0 +1,95 @@
+#[=======================================================================[.rst:
+myx_download_content
+-----------------------
+
+Функция для загрузки дополнительных репозиториев::
+
+  myx_download_content(NAME
+    [ DOWNLOAD_DIR dir ] |
+    [ GIT_REPOSITORY url ] |
+    [ GIT_TAG tag ] |
+    [ AUTOFETCH ] | [ AUTOPULL ] )
+
+Обязательный параметр: `NAME` - имя целевого каталога.
+Параметр `DOWNLOAD_DIR` содержит имя каталога, в который будет загружаться
+содержимое (по умолчанию `_downloads`).
+Параметр `GIT_REPOSITORY` содержит адрес внешнего проекта, который нужно
+загрузить с помощью git.
+Параметр `GIT_TAG` содержит используемые метку, идентификатор коммита или
+ветку в загружаемом репозитории.
+Если указана опция `AUTOFETCH`, то на этапе конфигурирования для загруженного
+репозитория будут скачиваться изменения.
+Если указана опция `AUTOPULL`, то на этапе конфигурирования из загруженного
+репозитория будет изменяться рабочий каталог.
+
+#]=======================================================================]
+
+find_package(Git QUIET)
+
+option(ENABLE_DOWNLOAD_CONTENT "Enable download content" ON)
+
+if(CMAKE_SCRIPT_MODE_FILE)
+  include(${CMAKE_CURRENT_LIST_DIR}/ProjectIsTopLevel.cmake)
+endif()
+
+function(myx_download_content NAME)
+  set(options AUTOFETCH AUTOPULL)
+  set(oneValueArgs)
+  set(multiValueArgs DOWNLOAD_DIR GIT_REPOSITORY GIT_TAG)
+  cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+  if(NOT CMAKE_SCRIPT_MODE_FILE)
+    if(TARGET myx-download-${NAME})
+      return()
+    else()
+      add_custom_target(myx-download-${NAME})
+    endif()
+    if(NOT TARGET myx-download-content)
+      add_custom_target(myx-download-content)
+    endif()
+  endif()
+
+  if(NOT PROJECT_IS_TOP_LEVEL)
+    return()
+  endif()
+
+  if(NOT ARG_DOWNLOAD_DIR)
+    set(ARG_DOWNLOAD_DIR "_downloads")
+  endif()
+
+  if(CMAKE_SCRIPT_MODE_FILE)
+    set(PROJECT_SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR})
+  endif()
+  set(ARG_DOWNLOAD_DIR ${PROJECT_SOURCE_DIR}/${ARG_DOWNLOAD_DIR})
+
+  if(NOT IS_DIRECTORY ${ARG_DOWNLOAD_DIR})
+    execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${ARG_DOWNLOAD_DIR})
+  endif()
+
+  set(WORK_DIR "${ARG_DOWNLOAD_DIR}/${NAME}")
+  if(ENABLE_DOWNLOAD_CONTENT AND GIT_EXECUTABLE AND ARG_GIT_REPOSITORY)
+    if(NOT IS_DIRECTORY ${WORK_DIR})
+      execute_process(COMMAND ${GIT_EXECUTABLE} clone ${ARG_GIT_REPOSITORY} ${NAME}
+                      WORKING_DIRECTORY ${ARG_DOWNLOAD_DIR})
+    else()
+      if(ARG_AUTOFETCH)
+        execute_process(COMMAND ${GIT_EXECUTABLE} fetch
+                        WORKING_DIRECTORY ${WORK_DIR})
+      endif()
+    endif()
+    if(ARG_GIT_TAG)
+      execute_process(COMMAND ${GIT_EXECUTABLE} checkout ${ARG_GIT_TAG}
+                      WORKING_DIRECTORY ${WORK_DIR})
+    else()
+      if(ARG_AUTOPULL)
+        execute_process(COMMAND ${GIT_EXECUTABLE} pull
+                        WORKING_DIRECTORY ${WORK_DIR})
+      endif()
+    endif()
+  endif()
+
+  if(NOT CMAKE_SCRIPT_MODE_FILE AND EXISTS "${WORK_DIR}/CMakeLists.txt")
+    add_subdirectory(${WORK_DIR} EXCLUDE_FROM_ALL)
+  endif()
+endfunction()
+
--- a/cmake/myx/lib/FetchContentAdd.cmake
+++ b/cmake/myx/lib/FetchContentAdd.cmake
@ -1,56 +0,0 @@
-#[=======================================================================[.rst:
-FetchContent_Add
----------------
-
-Вспомогательная функция для `FetchContent_Declare()`::
-
-    FetchContent_Add(NAME
-      [ GIT_REPOSITORY repo ] |
-      [ GIT_REMOTE remote ] |
-      [ GIT_PATH path ])
-
-Обязательные параметры: `NAME` - идентификатор загружаемого ресурса.
-Параметр `GIT_REPOSITORY` определяет имя репозитория по умолчанию.
-Если указана пара параметров `GIT_REMOTE` и `GIT_PATH` и у git-репозитория
-основного проекта указан удалённый репозиторий с именем, определяемым
-переменной `GIT_REMOTE`, то адрес репозитория для получения проекта
-изменяется. В этом случае загрузка будет производиться с сервера,
-определяемого из адреса с меткой `GIT_REMOTE`, и по пути `GIT_PATH`.
-
-#]=======================================================================]
-
-include_guard(GLOBAL)
-
-# Обязательно в глобальной области
-find_package(Git)
-
-function(FetchContent_Add TARGET_NAME)
-  set(options "")
-  set(oneValueArgs GIT_REPOSITORY GIT_REMOTE GIT_PATH)
-  set(multiValueArgs "")
-
-  cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
-  if(GIT_FOUND AND ARG_GIT_REMOTE AND ARG_GIT_PATH)
-    execute_process(COMMAND ${GIT_EXECUTABLE} config --get remote.${ARG_GIT_REMOTE}.url OUTPUT_VARIABLE REMOTE_URL ERROR_QUIET)
-    if(REMOTE_URL)
-      string(REGEX REPLACE ":.*" "" SERVER ${REMOTE_URL})
-      string(FIND ${SERVER} "http" POS)
-      if(NOT POS EQUAL 0)
-        if(NOT SERVER STREQUAL REMOTE_URL)
-          set(ARG_GIT_REPOSITORY "${SERVER}:${ARG_GIT_PATH}")
-        endif()
-      endif()
-    endif()
-  endif()
-
-  FetchContent_Declare(
-    ${TARGET_NAME}
-    ${ARG_UNPARSED_ARGUMENTS}
-    GIT_REPOSITORY ${ARG_GIT_REPOSITORY}
-    GIT_SHALLOW 1
-    )
-
-  set(FETCHCONTENT_QUIET off)
-  FetchContent_MakeAvailable(${TARGET_NAME})
-endfunction()
--- a/cmake/myx/lib/NinjaGeneratorWarning.cmake
+++ b/cmake/myx/lib/NinjaGeneratorWarning.cmake
@ -1,8 +1,7 @@
-# Версии CMake, как минимум до 3.8.0, генерируют некорректные
-# правила для ninja.
+# Версии CMake, как минимум до 3.8, генерируют некорректные правила для ninja.

 include_guard(GLOBAL)

-if(${CMAKE_VERSION} VERSION_LESS "3.8.0" AND CMAKE_GENERATOR MATCHES Ninja)
+if(${CMAKE_VERSION} VERSION_LESS 3.8 AND CMAKE_GENERATOR MATCHES Ninja)
  myx_message_send_error("Myx: Old CMake versions should use Makefile generator")
 endif()
--- a/cmake/myx/lib/ProjectIsTopLevel.cmake
+++ b/cmake/myx/lib/ProjectIsTopLevel.cmake
@ -0,0 +1,15 @@
+include_guard(GLOBAL)
+
+# Установка переменной, определяющей находится ли текущий
+# проект на верхнем уровне.
+# (Файл перемещён из каталога backports в lib для myx_download_content)
+#
+if(${CMAKE_VERSION} VERSION_LESS 3.21)
+  get_property(pd DIRECTORY PROPERTY PARENT_DIRECTORY)
+  if(NOT pd)
+    set(PROJECT_IS_TOP_LEVEL TRUE)
+  else()
+    set(PROJECT_IS_TOP_LEVEL FALSE)
+  endif()
+  unset(pd)
+endif()
--- a/cmake/myx/lib/Qt5TargetSetup.cmake
+++ b/cmake/myx/lib/Qt5TargetSetup.cmake
@ -1,112 +0,0 @@
-include_guard(GLOBAL)
-
-function(myx_qt5_target_setup TARGET_NAME)
-  set(options)
-  set(oneValueArgs)
-  set(multiValueArgs COMPONENTS PRIVATE PUBLIC_MOC PRIVATE_MOC UI QRC LANGS)
-
-  cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
-  get_target_property(__target_type ${TARGET_NAME} TYPE)
-
-  foreach(iter ${ARG_COMPONENTS})
-    if(__target_type STREQUAL "INTERFACE_LIBRARY")
-      target_include_directories(${TARGET_NAME} INTERFACE ${Qt5${iter}_INCLUDE_DIRS})
-    else()
-      target_include_directories(${TARGET_NAME} PRIVATE ${Qt5${iter}_INCLUDE_DIRS})
-    endif()
-    if(NOT iter STREQUAL "LinguistTools")
-      if(__target_type STREQUAL "EXECUTABLE")
-        target_link_libraries(${TARGET_NAME} PRIVATE "Qt5::${iter}")
-      endif()
-      if(__target_type STREQUAL "SHARED_LIBRARY")
-        target_link_libraries(${TARGET_NAME} PUBLIC "Qt5::${iter}")
-      endif()
-      if((${CMAKE_VERSION} VERSION_GREATER "3.8.0") AND (__target_type STREQUAL "OBJECT_LIBRARY"))
-        target_link_libraries(${TARGET_NAME} PUBLIC "Qt5::${iter}")
-      endif()
-    endif()
-  endforeach()
-
-  foreach(iter ${ARG_PRIVATE})
-    if(__target_type STREQUAL "INTERFACE_LIBRARY")
-      target_include_directories(${TARGET_NAME} INTERFACE ${Qt5${iter}_PRIVATE_INCLUDE_DIRS})
-    else()
-      target_include_directories(${TARGET_NAME} PRIVATE ${Qt5${iter}_PRIVATE_INCLUDE_DIRS})
-    endif()
-  endforeach()
-
-  if(__target_type STREQUAL "EXECUTABLE")
-    target_compile_options(${TARGET_NAME} PRIVATE ${Qt5Core_EXECUTABLE_COMPILE_FLAGS})
-  endif()
-
-  if(ARG_PUBLIC_MOC)
-    set_property(TARGET ${TARGET_NAME} APPEND PROPERTY PUBLIC_HEADER_FILES "${ARG_PUBLIC_MOC}")
-    set_property(TARGET ${TARGET_NAME} APPEND PROPERTY TR_FILES ${ARG_PUBLIC_MOC})
-  endif()
-
-  if(ARG_PRIVATE_MOC)
-    set_property(TARGET ${TARGET_NAME} APPEND PROPERTY PRIVATE_HEADER_FILES "${ARG_PRIVATE_MOC}")
-    set_property(TARGET ${TARGET_NAME} APPEND PROPERTY TR_FILES ${ARG_PRIVATE_MOC})
-  endif()
-
-  if(ARG_PUBLIC_MOC OR ARG_PRIVATE_MOC)
-    qt5_wrap_cpp(moc_cpp ${ARG_PUBLIC_MOC} ${ARG_PRIVATE_MOC})
-  endif()
-
-  if(ARG_QRC)
-    qt5_add_resources(qrc_cpp ${ARG_QRC})
-  endif()
-
-  if(ARG_UI AND "Widgets" IN_LIST ARG_COMPONENTS)
-    qt5_wrap_ui(ui_h ${ARG_UI})
-    set_property(TARGET ${TARGET_NAME} APPEND PROPERTY TR_FILES ${ARG_UI})
-    # TODO
-    target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_BINARY_DIR})
-  endif()
-
-  # Перечень файлов, подлежащих переводу
-  if(__target_type STREQUAL "INTERFACE_LIBRARY")
-    get_target_property(tr ${TARGET_NAME} INTERFACE_TR_FILES)
-  else()
-    get_target_property(tr ${TARGET_NAME} TR_FILES)
-  endif()
-  # Формирование файла ресурсов с переводами
-  if("LinguistTools" IN_LIST ARG_COMPONENTS AND tr)
-    # Заглавие файла ресурсов
-    file(WRITE ${PROJECT_BINARY_DIR}/${TARGET_NAME}_l10n.qrc "<RCC><qresource prefix=\"/qm\">\n")
-    # Для каждого языка, указанное в параметре LANGS
-    foreach(iter ${ARG_LANGS})
-      # Создание или обновление файла переводов в каталоге ${PROJECT_SOURCE_DIR}/l10n
-      # и его компиляция в каталог ${PROJECT_BINARY_DIR}
-      qt5_create_translation(qm ${tr}
-        "${PROJECT_SOURCE_DIR}/l10n/${TARGET_NAME}_${iter}.ts"
-        OPTIONS -I ${PROJECT_SOURCE_DIR}/include -I ${PROJECT_SOURCE_DIR}/include/${PROJECT_NAME})
-      # Добавление записи для скомпилированного файла переводов в ресурсный файл
-      file(APPEND ${PROJECT_BINARY_DIR}/${TARGET_NAME}_l10n.qrc
-        "<file alias=\"${TARGET_NAME}_${iter}\">${TARGET_NAME}_${iter}.qm</file>\n")
-      # Добавление скомпилированного файла переводов к списку зависимостей для цели
-      target_sources(${TARGET_NAME} PRIVATE ${qm})
-    endforeach()
-    # Окончание файла ресурсов
-    file(APPEND ${PROJECT_BINARY_DIR}/${TARGET_NAME}_l10n.qrc "</qresource></RCC>\n")
-    # Компиляция файла ресурсов с переводами
-    qt5_add_resources(qrc_l10n ${PROJECT_BINARY_DIR}/${TARGET_NAME}_l10n.qrc)
-    target_sources(${TARGET_NAME} PRIVATE ${qrc_l10n})
-  endif()
-  unset(tr)
-  if(__target_type STREQUAL "INTERFACE_LIBRARY")
-    target_sources(${TARGET_NAME} INTERFACE ${ARG_PUBLIC_MOC} ${ARG_PRIVATE_MOC} ${moc_cpp} ${ui_h} ${qrc_cpp})
-  else()
-    target_sources(${TARGET_NAME} PRIVATE ${ARG_PUBLIC_MOC} ${ARG_PRIVATE_MOC} ${moc_cpp} ${ui_h} ${qrc_cpp})
-  endif()
-
-  # Установка публичных заголовочных файлов
-  if(PROJECT_IS_TOP_LEVEL)
-    myx_install_relative(${PROJECT_SOURCE_DIR}
-      FILES ${ARG_PUBLIC_MOC}
-      DESTINATION ${CMAKE_INSTALL_PREFIX}
-      COMPONENT DEV
-     )
-  endif()
-endfunction()
--- a/cmake/myx/lib/TargetSetup.cmake
+++ b/cmake/myx/lib/TargetSetup.cmake
@ -3,7 +3,8 @@ include_guard(GLOBAL)
 function(myx_target_setup TARGET_NAME)
  set(options)
  set(oneValueArgs PCH)
-  set(multiValueArgs COMPILE_DEFINITIONS PACKAGES LINK_LIBRARIES
+  set(multiValueArgs PACKAGES
+                     COMPILE_DEFINITIONS INCLUDE_DIRECTORIES LINK_LIBRARIES
                     CPP PUBLIC_HEADERS PRIVATE_HEADERS)
  cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})

@ -11,8 +12,8 @@ function(myx_target_setup TARGET_NAME)
    myx_message_fatal_error("Target ${TARGET_NAME} does not exists.")
  endif()

-  get_target_property(__target_type ${TARGET_NAME} TYPE)
-  if(${__target_type} STREQUAL "INTERFACE_LIBRARY")
+  get_target_property(target_type ${TARGET_NAME} TYPE)
+  if(${target_type} STREQUAL "INTERFACE_LIBRARY")
    myx_message_fatal_error("This function will not work for interface targets.")
  endif()

@ -53,7 +54,7 @@ function(myx_target_setup TARGET_NAME)
      $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>)
  endif()

-  if(__target_type STREQUAL "EXECUTABLE")
+  if(target_type STREQUAL "EXECUTABLE")
    if(IS_DIRECTORY "${PROJECT_SOURCE_DIR}/include")
      target_include_directories(${PROJECT_NAME} PRIVATE
        $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>)
@ -74,42 +75,49 @@ function(myx_target_setup TARGET_NAME)
    install(TARGETS ${TARGET_NAME} COMPONENT MAIN RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
  endif()

-  target_sources(${TARGET_NAME} PUBLIC ${ARG_PUBLIC_HEADERS})
+  if(${CMAKE_VERSION} VERSION_LESS "3.11.99")
+    target_sources(${TARGET_NAME} PRIVATE $<BUILD_INTERFACE:${ARG_PUBLIC_HEADERS}>)
+    target_sources(${TARGET_NAME} PRIVATE $<BUILD_INTERFACE:${ARG_CPP} ${ARG_PCH} ${ARG_PRIVATE_HEADERS}>)
+  else()
+    target_sources(${TARGET_NAME} PRIVATE ${ARG_PUBLIC_HEADERS})
    target_sources(${TARGET_NAME} PRIVATE ${ARG_CPP} ${ARG_PCH} ${ARG_PRIVATE_HEADERS})
-  target_sources(${TARGET_NAME} PUBLIC $<BUILD_INTERFACE:${ARG_INTERFACE_HEADERS}>)
+  endif()
  target_compile_definitions(${TARGET_NAME} PRIVATE ${ARG_COMPILE_DEFINITIONS})
+  target_include_directories(${TARGET_NAME} PRIVATE ${ARG_INCLUDE_DIRECTORIES})

  # CMake до версии 3.12 не умеет извлекать из целей типа `OBJECT_LIBRARY`
  # информацию о заголовочных файлах. Это обход.
  if(${CMAKE_VERSION} VERSION_GREATER "3.11.99")
    target_link_libraries(${TARGET_NAME} PRIVATE ${ARG_LINK_LIBRARIES})
  else()
-    if((NOT ${__target_type} STREQUAL "OBJECT_LIBRARY") AND
-       (NOT ${__target_type} STREQUAL "EXECUTABLE"))
+    if((NOT ${target_type} STREQUAL "OBJECT_LIBRARY") AND
+       (NOT ${target_type} STREQUAL "EXECUTABLE"))
      target_link_libraries(${TARGET_NAME} PRIVATE ${ARG_LINK_LIBRARIES})
    else()
-      foreach(__link_library ${ARG_LINK_LIBRARIES})
-        if(TARGET ${__link_library})
-          get_target_property(__lib_type ${__link_library} TYPE)
-          if(__lib_type)
-            get_target_property(__include_dirs ${__link_library} INTERFACE_INCLUDE_DIRECTORIES)
-            if(__include_dirs)
-              target_include_directories(${TARGET_NAME} PUBLIC ${__include_dirs})
+      foreach(link_library ${ARG_LINK_LIBRARIES})
+        if(TARGET ${link_library})
+          get_target_property(library_type ${link_library} TYPE)
+          if(library_type)
+            get_target_property(include_dirs ${link_library} INTERFACE_INCLUDE_DIRECTORIES)
+            if(include_dirs)
+              target_include_directories(${TARGET_NAME} PUBLIC ${include_dirs})
            endif()
-            if(${__target_type} STREQUAL "EXECUTABLE")
-              if(${__lib_type} STREQUAL "OBJECT_LIBRARY")
-                if(TARGET ${__link_library}_static)
-                  target_link_libraries(${TARGET_NAME} PRIVATE ${__link_library}_static)
+            if(${target_type} STREQUAL "EXECUTABLE")
+              if(${library_type} STREQUAL "OBJECT_LIBRARY")
+                if(TARGET ${link_library}_static)
+                  target_link_libraries(${TARGET_NAME} PRIVATE ${link_library}_static)
                else()
-                  target_link_libraries(${TARGET_NAME} PRIVATE ${__link_library}_shared)
+                  target_link_libraries(${TARGET_NAME} PRIVATE ${link_library}_shared)
                endif()
              else()
-                target_link_libraries(${TARGET_NAME} PRIVATE ${__link_library})
+                target_link_libraries(${TARGET_NAME} PRIVATE ${link_library})
              endif()
            endif()
          endif()
        else()
-          target_link_libraries(${TARGET_NAME} PRIVATE ${__link_library})
+          if((${CMAKE_VERSION} VERSION_GREATER "3.7.99") OR (NOT target_type STREQUAL "OBJECT_LIBRARY"))
+            target_link_libraries(${TARGET_NAME} PRIVATE ${link_library})
+          endif()
        endif()
      endforeach()
    endif()
--- a/cmake/myx/lib/TargetSetupQt.cmake
+++ b/cmake/myx/lib/TargetSetupQt.cmake
@ -0,0 +1,155 @@
+include_guard(GLOBAL)
+
+function(myx_target_setup_qt TARGET_NAME)
+  set(options)
+  set(oneValueArgs)
+  set(multiValueArgs COMPONENTS PRIVATE PUBLIC_MOC PRIVATE_MOC UI QRC LANGS)
+
+  cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+  set(myx_qt_ver "5")
+  if(QT_DEFAULT_MAJOR_VERSION)
+    set(myx_qt_ver "${QT_DEFAULT_MAJOR_VERSION}")
+  endif()
+
+  if(NOT (myx_qt_ver STREQUAL "5" OR myx_qt_ver STREQUAL "6"))
+    myx_message_fatal_error("Supported Qt versions are 5 and 6")
+  endif()
+
+  get_target_property(target_type ${TARGET_NAME} TYPE)
+
+  foreach(iter ${ARG_COMPONENTS})
+    if(target_type STREQUAL "INTERFACE_LIBRARY")
+      target_include_directories(${TARGET_NAME} INTERFACE ${Qt${myx_qt_ver}${iter}_INCLUDE_DIRS})
+    else()
+      target_include_directories(${TARGET_NAME} PRIVATE ${Qt${myx_qt_ver}${iter}_INCLUDE_DIRS})
+      if(NOT iter STREQUAL "LinguistTools")
+        if(target_type STREQUAL "EXECUTABLE")
+          target_link_libraries(${TARGET_NAME} PRIVATE Qt${myx_qt_ver}::${iter})
+        endif()
+        if(target_type STREQUAL "SHARED_LIBRARY")
+          target_link_libraries(${TARGET_NAME} PUBLIC Qt${myx_qt_ver}::${iter})
+        endif()
+        if((${CMAKE_VERSION} VERSION_GREATER 3.8.0) AND (target_type STREQUAL "OBJECT_LIBRARY"))
+          target_link_libraries(${TARGET_NAME} PUBLIC Qt${myx_qt_ver}::${iter})
+        else()
+          target_include_directories(${TARGET_NAME} PUBLIC ${Qt${myx_qt_ver}${iter}_INCLUDE_DIRS})
+        endif()
+      endif()
+    endif()
+  endforeach()
+
+  foreach(iter ${ARG_PRIVATE})
+    if(target_type STREQUAL "INTERFACE_LIBRARY")
+      target_include_directories(${TARGET_NAME} INTERFACE ${Qt${myx_qt_ver}${iter}_PRIVATE_INCLUDE_DIRS})
+    else()
+      target_include_directories(${TARGET_NAME} PRIVATE ${Qt${myx_qt_ver}${iter}_PRIVATE_INCLUDE_DIRS})
+    endif()
+  endforeach()
+
+  if(target_type STREQUAL "EXECUTABLE")
+    target_compile_options(${TARGET_NAME} PRIVATE ${Qt${myx_qt_ver}Core_EXECUTABLE_COMPILE_FLAGS})
+  endif()
+
+  if(ARG_PUBLIC_MOC)
+    set_property(TARGET ${TARGET_NAME} APPEND PROPERTY PUBLIC_HEADER_FILES "${ARG_PUBLIC_MOC}")
+    set_property(TARGET ${TARGET_NAME} APPEND PROPERTY TR_FILES ${ARG_PUBLIC_MOC})
+  endif()
+
+  if(ARG_PRIVATE_MOC)
+    set_property(TARGET ${TARGET_NAME} APPEND PROPERTY PRIVATE_HEADER_FILES "${ARG_PRIVATE_MOC}")
+    set_property(TARGET ${TARGET_NAME} APPEND PROPERTY TR_FILES ${ARG_PRIVATE_MOC})
+  endif()
+
+  if(ARG_PUBLIC_MOC OR ARG_PRIVATE_MOC)
+    if(myx_qt_ver EQUAL 5)
+      qt5_wrap_cpp(moc_cpp ${ARG_PUBLIC_MOC} ${ARG_PRIVATE_MOC})
+    elseif(myx_qt_ver EQUAL 6)
+      qt6_wrap_cpp(moc_cpp ${ARG_PUBLIC_MOC} ${ARG_PRIVATE_MOC})
+    endif()
+  endif()
+
+  if(ARG_QRC)
+    if(myx_qt_ver EQUAL 5)
+      qt5_add_resources(qrc_cpp ${ARG_QRC})
+    elseif(myx_qt_ver EQUAL 6)
+      qt6_add_resources(qrc_cpp ${ARG_QRC})
+    endif()
+  endif()
+
+  if(ARG_UI)
+    if(NOT COMMAND qt${myx_qt_ver}_wrap_ui)
+      message(WARNING "MyxCMake: Widgets is required to process UI")
+    else()
+      if(myx_qt_ver EQUAL 5)
+        qt5_wrap_ui(ui_h ${ARG_UI})
+      elseif(myx_qt_ver EQUAL 6)
+        qt6_wrap_ui(ui_h ${ARG_UI})
+      endif()
+      set_property(TARGET ${TARGET_NAME} APPEND PROPERTY TR_FILES ${ARG_UI})
+      target_link_libraries(${TARGET_NAME} PRIVATE Qt${myx_qt_ver}::Widgets)
+      # TODO
+      target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_BINARY_DIR})
+    endif()
+  endif()
+
+  # Перечень файлов, подлежащих переводу
+  if(target_type STREQUAL "INTERFACE_LIBRARY")
+    get_target_property(tr ${TARGET_NAME} INTERFACE_TR_FILES)
+  else()
+    get_target_property(tr ${TARGET_NAME} TR_FILES)
+  endif()
+
+  # Формирование файла ресурсов с переводами
+  if(tr AND ARG_LANGS)
+    if(NOT COMMAND qt${myx_qt_ver}_create_translation)
+      message(WARNING "MyxCMake: LinguistTools is required to process LANGS")
+    else()
+      # Заглавие файла ресурсов
+      file(WRITE ${PROJECT_BINARY_DIR}/${TARGET_NAME}_l10n.qrc "<RCC><qresource prefix=\"/l10n\">\n")
+      # Для каждого языка, указанное в параметре LANGS
+      foreach(iter ${ARG_LANGS})
+        # Создание или обновление файла переводов в каталоге ${PROJECT_SOURCE_DIR}/l10n
+        # и его компиляция в каталог ${PROJECT_BINARY_DIR}
+        if(myx_qt_ver EQUAL 5)
+          qt5_create_translation(qm ${tr}
+            "${PROJECT_SOURCE_DIR}/l10n/${TARGET_NAME}_${iter}.ts"
+            OPTIONS -I ${PROJECT_SOURCE_DIR}/include -I ${PROJECT_SOURCE_DIR}/include/${PROJECT_NAME})
+        elseif(myx_qt_ver EQUAL 6)
+          qt6_create_translation(qm ${tr}
+            "${PROJECT_SOURCE_DIR}/l10n/${TARGET_NAME}_${iter}.ts"
+            OPTIONS -I ${PROJECT_SOURCE_DIR}/include -I ${PROJECT_SOURCE_DIR}/include/${PROJECT_NAME})
+        endif()
+        # Добавление записи для скомпилированного файла переводов в ресурсный файл
+        file(APPEND ${PROJECT_BINARY_DIR}/${TARGET_NAME}_l10n.qrc
+          "<file alias=\"${TARGET_NAME}_${iter}.qm\">${TARGET_NAME}_${iter}.qm</file>\n")
+        # Добавление скомпилированного файла переводов к списку зависимостей для цели
+        target_sources(${TARGET_NAME} PRIVATE ${qm})
+      endforeach()
+      # Окончание файла ресурсов
+      file(APPEND ${PROJECT_BINARY_DIR}/${TARGET_NAME}_l10n.qrc "</qresource></RCC>\n")
+      # Компиляция файла ресурсов с переводами
+      if(myx_qt_ver EQUAL 5)
+        qt5_add_resources(qrc_l10n ${PROJECT_BINARY_DIR}/${TARGET_NAME}_l10n.qrc)
+      elseif(myx_qt_ver EQUAL 6)
+        qt6_add_resources(qrc_l10n ${PROJECT_BINARY_DIR}/${TARGET_NAME}_l10n.qrc)
+      endif()
+      target_sources(${TARGET_NAME} PRIVATE ${qrc_l10n})
+    endif()
+  endif()
+  unset(tr)
+  if(target_type STREQUAL "INTERFACE_LIBRARY")
+    target_sources(${TARGET_NAME} INTERFACE ${ARG_PUBLIC_MOC} ${ARG_PRIVATE_MOC} ${moc_cpp} ${ui_h} ${qrc_cpp})
+  else()
+    target_sources(${TARGET_NAME} PRIVATE ${ARG_PUBLIC_MOC} ${ARG_PRIVATE_MOC} ${moc_cpp} ${ui_h} ${qrc_cpp})
+  endif()
+
+  # Установка публичных заголовочных файлов
+  if(PROJECT_IS_TOP_LEVEL)
+    myx_install_relative(${PROJECT_SOURCE_DIR}
+      FILES ${ARG_PUBLIC_MOC}
+      DESTINATION ${CMAKE_INSTALL_PREFIX}
+      COMPONENT DEV
+    )
+  endif()
+endfunction()
--- a/cmake/myx/lib/Toolchains.cmake
+++ b/cmake/myx/lib/Toolchains.cmake
@ -34,23 +34,38 @@ if(CMAKE_SYSTEM_NAME STREQUAL Linux)
 endif()

 if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-  include("${MYX_CMAKE_TOOLCHAINS_DIR}/GCC.cmake")
+  if(CMAKE_COLOR_MAKEFILE)
+    check_enable_cxx_compiler_flag(-fdiagnostics-color=auto)
+  endif()
 endif()

 if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-  include("${MYX_CMAKE_TOOLCHAINS_DIR}/Clang.cmake")
+  if(CMAKE_COLOR_MAKEFILE)
+    check_enable_cxx_compiler_flag(-fcolor-diagnostics)
+  endif()
 endif()

 if((MYX_CMAKE_LSB_DISTRIBUTOR_ID  STREQUAL "AstraLinuxSE") AND
   (MYX_CMAKE_LSB_CODENAME        STREQUAL "smolensk") AND
   (MYX_CMAKE_LSB_RELEASE_VERSION STREQUAL "1.5"))
-  include("${MYX_CMAKE_TOOLCHAINS_DIR}/AstraLinuxSE-1.5.cmake")
-  return()
+  find_program(CMAKE_AR NAMES "/usr/bin/x86_64-linux-gnu-gcc-ar-4.7")
+  find_program(CMAKE_NM NAMES "/usr/bin/x86_64-linux-gnu-gcc-nm-4.7")
+  find_program(CMAKE_RANLIB NAMES "/usr/bin/x86_64-linux-gnu-gcc-ranlib-4.7")
+
+  set(CMAKE_CXX_STANDARD 11)
+  set(CMAKE_CXX_EXTENSIONS ON)
+  check_enable_cxx_compiler_flag(-Wno-shadow)
 endif()

 if((MYX_CMAKE_LSB_DISTRIBUTOR_ID  STREQUAL "ElbrusD") AND
   (MYX_CMAKE_LSB_CODENAME        STREQUAL "Jessie") AND
   (MYX_CMAKE_LSB_RELEASE_VERSION VERSION_GREATER "1.4"))
-  include("${MYX_CMAKE_TOOLCHAINS_DIR}/ElbrusD-1.4.cmake")
-  return()
+  find_program(CMAKE_AR NAMES "/usr/${CMAKE_SYSTEM_PROCESSOR}-linux/bin/ar")
+  find_program(CMAKE_NM NAMES "/usr/${CMAKE_SYSTEM_PROCESSOR}-linux/bin/nm")
+  find_program(CMAKE_RANLIB NAMES "/usr/${CMAKE_SYSTEM_PROCESSOR}-linux/bin/ranlib")
+
+  set(CMAKE_CXX_STANDARD 14)
+  set(CMAKE_CXX_EXTENSIONS ON)
+  check_enable_cxx_compiler_flag(-Wno-invalid-offsetof)
+  list(APPEND CMAKE_LIBRARY_PATH "/usr/lib/e2k-linux-gnu")
 endif()
--- a/cmake/myx/lib/doc/Doxygen.cmake
+++ b/cmake/myx/lib/doc/Doxygen.cmake
@ -1,9 +1,11 @@
-if(${CMAKE_VERSION} VERSION_LESS "3.17.0")
+if(${CMAKE_VERSION} VERSION_LESS 3.17)
  set(MYX_CMAKE_LIB_DOC_DIR_BACKPORT "${CMAKE_CURRENT_LIST_DIR}")
 endif()

+find_package(Doxygen QUIET)
+
 function(myx_doc_doxygen TARGET_NAME)
-  if(${CMAKE_VERSION} VERSION_LESS "3.17.0")
+  if(${CMAKE_VERSION} VERSION_LESS 3.17)
    set(CMAKE_CURRENT_FUNCTION_LIST_DIR ${MYX_CMAKE_LIB_DOC_DIR_BACKPORT})
  endif()

@ -11,7 +13,6 @@ function(myx_doc_doxygen TARGET_NAME)
    return()
  endif()

-  find_package(Doxygen)
  if(DOXYGEN_FOUND)
    set(DOXYGEN_FOUND ON CACHE STRING "Doxygen documentation generator enabled" FORCE)
    set(DOXYGEN_EXECUTABLE "${DOXYGEN_EXECUTABLE}" CACHE STRING "Path to Doxygen executable")
--- a/cmake/myx/lib/generators/GitInfo.cmake
+++ b/cmake/myx/lib/generators/GitInfo.cmake
@ -7,7 +7,7 @@ set(GIT_DIFF "")
 set(GIT_TAG "N/A")
 set(GIT_BRANCH "N/A")

-find_package(Git)
+find_package(Git QUIET)

 if(GIT_EXECUTABLE)
  execute_process(COMMAND ${GIT_EXECUTABLE} log --pretty=format:'%h' -n 1 OUTPUT_VARIABLE GIT_REV ERROR_QUIET)
--- a/cmake/myx/lib/generators/GitInfoHeader.cmake
+++ b/cmake/myx/lib/generators/GitInfoHeader.cmake
@ -17,12 +17,12 @@ myx_generate_git_info_header

 include_guard(GLOBAL)

-if(${CMAKE_VERSION} VERSION_LESS "3.17.0")
+if(${CMAKE_VERSION} VERSION_LESS 3.17.0)
  set(MYX_CMAKE_LIB_GENERATORS_DIR_BACKPORT "${CMAKE_CURRENT_LIST_DIR}")
 endif()

 function(myx_generate_git_info_header TARGET_NAME BASE_FILENAME)
-  if(${CMAKE_VERSION} VERSION_LESS "3.17.0")
+  if(${CMAKE_VERSION} VERSION_LESS 3.17.0)
    set(CMAKE_CURRENT_FUNCTION_LIST_DIR ${MYX_CMAKE_LIB_GENERATORS_DIR_BACKPORT})
  endif()

@ -31,26 +31,31 @@ function(myx_generate_git_info_header TARGET_NAME BASE_FILENAME)
  set(multiValueArgs)
  cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})

-  set(__filename "${PROJECT_BINARY_DIR}/include/${BASE_FILENAME}")
-  file(APPEND ${__filename} "")
+  set(filename "${PROJECT_BINARY_DIR}/include/${BASE_FILENAME}")
+  file(APPEND ${filename} "")

-  set(__prefix "")
+  set(prefix "")
  if(ARG_PREFIX)
    string(APPEND ARG_PREFIX "_")
-    string(REPLACE "-" "_" __prefix ${ARG_PREFIX})
+    string(REPLACE "-" "_" prefix ${ARG_PREFIX})
  endif()

 # cmake-format: off
  if(NOT TARGET ${TARGET_NAME}-git-info-header)
    add_custom_target(${TARGET_NAME}-git-info-header ALL
-      ${CMAKE_COMMAND} -DGIT_INFO_FILE=${__filename} -DPREFIX=${__prefix}
+      ${CMAKE_COMMAND} -DGIT_INFO_FILE=${filename} -DPREFIX=${prefix}
                       -P ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/GitInfo.cmake
-      BYPRODUCTS ${__filename}
+      BYPRODUCTS ${filename}
      WORKING_DIRECTORY ${CMAKE_CURRENT_FUNCTION_LIST_DIR})
  endif()
 # cmake-format: on

-  set_property(TARGET ${TARGET_NAME} APPEND PROPERTY PRIVATE_HEADER_FILES ${__filename})
-  target_sources(${TARGET_NAME} PRIVATE ${__filename})
+  set_property(TARGET ${TARGET_NAME} APPEND PROPERTY PRIVATE_HEADER_FILES ${filename})
+  get_target_property(target_type ${TARGET_NAME} TYPE)
+  if(${target_type} STREQUAL "INTERFACE_LIBRARY")
+    target_sources(${TARGET_NAME} INTERFACE $<BUILD_INTERFACE:${filename}>)
+  else()
+    target_sources(${TARGET_NAME} PRIVATE ${filename})
+  endif()
  add_dependencies(${TARGET_NAME} ${TARGET_NAME}-git-info-header)
 endfunction()
--- a/cmake/myx/lib/generators/PrivateConfigHeader.cmake
+++ b/cmake/myx/lib/generators/PrivateConfigHeader.cmake
@ -14,12 +14,12 @@ myx_generate_private_config_header

 include_guard(GLOBAL)

-if(${CMAKE_VERSION} VERSION_LESS "3.17.0")
+if(${CMAKE_VERSION} VERSION_LESS 3.17.0)
  set(MYX_CMAKE_LIB_GENERATORS_DIR_BACKPORT "${CMAKE_CURRENT_LIST_DIR}")
 endif()

 function(myx_generate_private_config_header TARGET_NAME BASE_FILENAME)
-  if(${CMAKE_VERSION} VERSION_LESS "3.17.0")
+  if(${CMAKE_VERSION} VERSION_LESS 3.17.0)
    set(CMAKE_CURRENT_FUNCTION_LIST_DIR ${MYX_CMAKE_LIB_GENERATORS_DIR_BACKPORT})
  endif()

@ -27,9 +27,14 @@ function(myx_generate_private_config_header TARGET_NAME BASE_FILENAME)
  myx_project_version_int()
  get_property(PROJECT_VERSION_INT GLOBAL PROPERTY PROJECT_VERSION_INT)

-  set(__filename "${PROJECT_BINARY_DIR}/include/${BASE_FILENAME}")
-  configure_file("${CMAKE_CURRENT_FUNCTION_LIST_DIR}/PrivateConfig.hpp.in" ${__filename})
+  set(filename "${PROJECT_BINARY_DIR}/include/${BASE_FILENAME}")
+  configure_file("${CMAKE_CURRENT_FUNCTION_LIST_DIR}/PrivateConfig.hpp.in" ${filename})

-  set_property(TARGET ${TARGET_NAME} APPEND PROPERTY PRIVATE_HEADER_FILES ${__filename})
-  target_sources(${TARGET_NAME} PRIVATE ${__filename})
+  set_property(TARGET ${TARGET_NAME} APPEND PROPERTY PRIVATE_HEADER_FILES ${filename})
+  get_target_property(target_type ${TARGET_NAME} TYPE)
+  if(${target_type} STREQUAL "INTERFACE_LIBRARY")
+    target_sources(${TARGET_NAME} INTERFACE $<BUILD_INTERFACE:${filename}>)
+  else()
+    target_sources(${TARGET_NAME} PRIVATE ${filename})
+  endif()
 endfunction()
--- a/cmake/myx/lib/macro/CheckEnableCxxCompilerFlag.cmake
+++ b/cmake/myx/lib/macro/CheckEnableCxxCompilerFlag.cmake
@ -27,8 +27,8 @@ macro(check_enable_cxx_compiler_flag FLAG)
  endif()

  unset(check_cxx_flag CACHE)
-  foreach(__iter IN LISTS oneValueArgs multiValueArgs)
-    unset(ARG_${__iter})
+  foreach(iter IN LISTS oneValueArgs multiValueArgs)
+    unset(ARG_${iter})
  endforeach()
  unset(ARG_UNPARSED_ARGUMENTS)
  unset(multiValueArgs)
--- a/cmake/myx/lib/macro/CreateSymlink.cmake
+++ b/cmake/myx/lib/macro/CreateSymlink.cmake
@ -3,7 +3,7 @@ include_guard(GLOBAL)
 # Создание символических ссылок
 macro(myx_create_symlink ORIGINAL_FILENAME LINKNAME)
  if(UNIX AND (NOT EXISTS ${LINKNAME}))
-    if(${CMAKE_VERSION} VERSION_LESS "3.14.0")
+    if(${CMAKE_VERSION} VERSION_LESS 3.14.0)
      execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
                              ${ORIGINAL_FILENAME} ${LINKNAME})
    else()
--- a/cmake/myx/lib/macro/FindPackages.cmake
+++ b/cmake/myx/lib/macro/FindPackages.cmake
@ -1,44 +1,62 @@
+#[=======================================================================[.rst:
+myx_find_packages
+-----------------
+
+Вспомогательная функция для поиска зависимостей::
+
+  myx_find_packages()
+
+Упрощённый способ поиска необходимых и опциональных зависимостей.
+Для поиска зависимостей с учётом особенных требований (например, номер версии)
+следует использовать функции `find_package` и `pkg_check_modules`.
+Параметр `REQUIRED` содержит перечисление необходимых зависимостей
+для поиска с помощью функции `find_package`.
+Параметр `OPTIONAL` содержит перечисление опциональных зависимостей
+для поиска с помощью функции `find_package`.
+Параметр `PKG_REQUIRED` содержит перечисление необходимых зависимостей
+для поиска с помощью функции `pkg_check_modules`.
+Параметр `PKG_OPTIONAL` содержит перечисление опциональных зависимостей
+для поиска с помощью функции `pkg_check_modules`.
+
+#]=======================================================================]
+
 include_guard(GLOBAL)

-macro(myx_find_required_packages)
+macro(myx_find_packages)
  set(options)
  set(oneValueArgs)
-  set(multiValueArgs PACKAGES Boost Qt5 Qt5Private Qt6 Qt6Private)
+  set(multiValueArgs REQUIRED OPTIONAL PKG_REQUIRED PKG_OPTIONAL)
  cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})

-  foreach(iter ${ARG_PACKAGES})
+  foreach(iter ${ARG_REQUIRED})
    find_package(${iter} REQUIRED)
  endforeach()

-  if(ARG_Boost)
-    find_package(Boost COMPONENTS ${ARG_Boost} REQUIRED)
-  endif()
+  foreach(iter ${ARG_OPTIONAL})
+    find_package(${iter})
+  endforeach()

-  if(ARG_Qt5)
-    find_package(Qt5 COMPONENTS ${ARG_Qt5} REQUIRED)
-  endif()
-
-  if(ARG_Qt5Private)
-    foreach(iter ${ARG_Qt5Private})
-      find_package("Qt5${iter}" COMPONENTS Private REQUIRED)
+  if(ARG_PKG_REQUIRED)
+    find_package(PkgConfig REQUIRED)
+    foreach(iter ${ARG_PKG_REQUIRED})
+      string(TOUPPER ${iter} iu)
+      pkg_check_modules(${iu} REQUIRED ${iter})
    endforeach()
  endif()

-  if(ARG_Qt6)
-    find_package(Qt6 COMPONENTS ${ARG_Qt6} REQUIRED)
-  endif()
-
-  if(ARG_Qt6Private)
-    foreach(iter ${ARG_Qt6Private})
-      find_package("Qt6${iter}" COMPONENTS Private REQUIRED)
+  if(ARG_PKG_OPTIONAL)
+    find_package(PkgConfig REQUIRED)
+    foreach(iter ${ARG_PKG_OPTIONAL})
+      string(TOUPPER ${iter} iu)
+      pkg_check_modules(${iu} ${iter})
    endforeach()
  endif()

-  foreach(__iter IN LISTS oneValueArgs multiValueArgs)
-    unset(ARG_${__iter})
+  foreach(iter IN LISTS oneValueArgs multiValueArgs)
+    unset(ARG_${iter})
  endforeach()
  unset(ARG_UNPARSED_ARGUMENTS)
  unset(multiValueArgs)
  unset(oneValueArgs)
  unset(options)
-endmacro(myx_find_required_packages)
+endmacro(myx_find_packages)
--- a/cmake/myx/lib/macro/FindQt.cmake
+++ b/cmake/myx/lib/macro/FindQt.cmake
@ -0,0 +1,40 @@
+include_guard(GLOBAL)
+
+macro(myx_find_qt)
+  set(options REQUIRED)
+  set(oneValueArgs VERSION)
+  set(multiValueArgs COMPONENTS PRIVATE)
+
+  cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+  if(NOT ARG_VERSION)
+    set(ARG_VERSION "5")
+    if(QT_DEFAULT_MAJOR_VERSION)
+      set(ARG_VERSION "${QT_DEFAULT_MAJOR_VERSION}")
+    endif()
+  endif()
+
+  if(ARG_REQUIRED)
+    set(ARG_REQUIRED "REQUIRED")
+  endif()
+
+  if(NOT (ARG_VERSION STREQUAL "5" OR ARG_VERSION STREQUAL "6"))
+    message(FATAL_ERROR "Supported Qt versions are 5 and 6")
+  endif()
+
+  foreach(iter ${ARG_COMPONENTS})
+    find_package(Qt${ARG_VERSION} COMPONENTS ${iter} ${ARG_REQUIRED})
+  endforeach()
+
+  foreach(iter ${ARG_PRIVATE})
+    find_package("Qt${ARG_VERSION}${iter}" COMPONENTS Private ${ARG_REQUIRED})
+  endforeach()
+
+  foreach(iter IN LISTS oneValueArgs multiValueArgs)
+    unset(ARG_${iter})
+  endforeach()
+  unset(ARG_UNPARSED_ARGUMENTS)
+  unset(multiValueArgs)
+  unset(oneValueArgs)
+  unset(options)
+endmacro()
--- a/cmake/myx/lib/macro/GTest.cmake
+++ b/cmake/myx/lib/macro/GTest.cmake
@ -19,8 +19,8 @@ macro(myx_add_gtest TARGET_NAME)
  endif()

  add_test(NAME ${TARGET_NAME} COMMAND ${TARGET_NAME})
-  foreach(__iter IN LISTS oneValueArgs multiValueArgs)
-    unset(ARG_${__iter})
+  foreach(iter IN LISTS oneValueArgs multiValueArgs)
+    unset(ARG_${iter})
  endforeach()
  unset(ARG_UNPARSED_ARGUMENTS)
  unset(multiValueArgs)
--- a/cmake/myx/lib/macro/QTest.cmake
+++ b/cmake/myx/lib/macro/QTest.cmake
@ -14,14 +14,14 @@ macro(myx_add_qtest TARGET_NAME)

  foreach(filename ${ARG_UNPARSED_ARGUMENTS})
    get_filename_component(basename ${filename} NAME_WE)
-    list(APPEND cpps "${basename}.cpp")
-    list(APPEND hpps "${basename}.hpp")
+    list(APPEND cpps "${CMAKE_CURRENT_SOURCE_DIR}/${basename}.cpp")
+    list(APPEND hpps "${CMAKE_CURRENT_SOURCE_DIR}/${basename}.hpp")
    qt5_wrap_cpp(moc "${basename}.hpp")
    list(APPEND mocs "${moc}")
  endforeach()

  add_executable(${TARGET_NAME} ${mocs} ${cpps} ${hpps})
-  target_link_libraries(${TARGET_NAME} Qt5::Core Qt5::Test)
+  target_link_libraries(${TARGET_NAME} PRIVATE Qt5::Core Qt5::Test)

  add_test(NAME ${TARGET_NAME} COMMAND ${TARGET_NAME})

@ -29,8 +29,8 @@ macro(myx_add_qtest TARGET_NAME)
  unset(hpps)
  unset(moc)
  unset(mocs)
-  foreach(__iter IN LISTS oneValueArgs multiValueArgs)
-    unset(ARG_${__iter})
+  foreach(iter IN LISTS oneValueArgs multiValueArgs)
+    unset(ARG_${iter})
  endforeach()
  unset(ARG_UNPARSED_ARGUMENTS)
  unset(multiValueArgs)
--- a/cmake/myx/lib/toolchains/AstraLinuxSE-1.5.cmake
+++ b/cmake/myx/lib/toolchains/AstraLinuxSE-1.5.cmake
@ -1,8 +0,0 @@
-find_program(CMAKE_AR NAMES "/usr/bin/x86_64-linux-gnu-gcc-ar-4.7")
-find_program(CMAKE_NM NAMES "/usr/bin/x86_64-linux-gnu-gcc-nm-4.7")
-find_program(CMAKE_RANLIB NAMES "/usr/bin/x86_64-linux-gnu-gcc-ranlib-4.7")
-
-set(CMAKE_CXX_STANDARD 11)
-set(CMAKE_CXX_EXTENSIONS ON)
-check_enable_cxx_compiler_flag(-Wno-shadow)
-
--- a/cmake/myx/lib/toolchains/Clang.cmake
+++ b/cmake/myx/lib/toolchains/Clang.cmake
@ -1,3 +0,0 @@
-if(CMAKE_COLOR_MAKEFILE)
-  check_enable_cxx_compiler_flag(-fcolor-diagnostics)
-endif()
--- a/cmake/myx/lib/toolchains/ElbrusD-1.4.cmake
+++ b/cmake/myx/lib/toolchains/ElbrusD-1.4.cmake
@ -1,9 +0,0 @@
-find_program(CMAKE_AR NAMES "/usr/${CMAKE_SYSTEM_PROCESSOR}-linux/bin/ar")
-find_program(CMAKE_NM NAMES "/usr/${CMAKE_SYSTEM_PROCESSOR}-linux/bin/nm")
-find_program(CMAKE_RANLIB NAMES "/usr/${CMAKE_SYSTEM_PROCESSOR}-linux/bin/ranlib")
-
-set(CMAKE_CXX_STANDARD 14)
-set(CMAKE_CXX_EXTENSIONS ON)
-check_enable_cxx_compiler_flag(-Wno-invalid-offsetof)
-list(APPEND CMAKE_LIBRARY_PATH "/usr/lib/e2k-linux-gnu")
-
--- a/cmake/myx/lib/toolchains/GCC.cmake
+++ b/cmake/myx/lib/toolchains/GCC.cmake
@ -1,3 +0,0 @@
-if(CMAKE_COLOR_MAKEFILE)
-  check_enable_cxx_compiler_flag(-fdiagnostics-color=auto)
-endif()
--- a/cmake/myx/lib/uncrustify/Uncrustify.cmake
+++ b/cmake/myx/lib/uncrustify/Uncrustify.cmake
@ -1,18 +1,14 @@
-if(${CMAKE_VERSION} VERSION_LESS "3.17.0")
+if(${CMAKE_VERSION} VERSION_LESS 3.17.0)
  set(MYX_CMAKE_LIB_UNCRUSTIFY_DIR_BACKPORT "${CMAKE_CURRENT_LIST_DIR}")
 endif()

 find_program(UNCRUSTIFY_EXE NAMES uncrustify)

 function(myx_uncrustify TARGET_NAME)
-  if(${CMAKE_VERSION} VERSION_LESS "3.17.0")
+  if(${CMAKE_VERSION} VERSION_LESS 3.17.0)
    set(CMAKE_CURRENT_FUNCTION_LIST_DIR ${MYX_CMAKE_LIB_UNCRUSTIFY_DIR_BACKPORT})
  endif()

-  if(NOT ${PROJECT_BINARY_DIR} STREQUAL ${CMAKE_BINARY_DIR})
-    return()
-  endif()
-
  set(options)
  set(oneValueArgs CONFIG)
  set(multiValueArgs)
@ -32,6 +28,12 @@ function(myx_uncrustify TARGET_NAME)
    return()
  endif()

+  get_filename_component(CONFIG_DIR ${ARG_CONFIG} DIRECTORY)
+  if(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CONFIG_DIR}")
+    myx_message("MyxCMake: skip uncrustify for project ${PROJECT_NAME}")
+    return()
+  endif()
+
  if(NOT TARGET myx-uncrustify)
    add_custom_target(myx-uncrustify)
  endif()
@ -43,51 +45,50 @@ function(myx_uncrustify TARGET_NAME)
  endif()

  # Динамически сгенерированные файлы исключаются
-  get_target_property(__target_type ${TARGET_NAME} TYPE)
-  if((${__target_type} STREQUAL "INTERFACE_LIBRARY") AND (${CMAKE_VERSION} VERSION_LESS "3.17.0"))
-    get_target_property(__s1 ${TARGET_NAME} INTERFACE_SOURCES)
-    if(__s1)
-      list(APPEND __all_sources ${__s1})
+  get_target_property(target_type ${TARGET_NAME} TYPE)
+  if((${target_type} STREQUAL "INTERFACE_LIBRARY") AND (${CMAKE_VERSION} VERSION_LESS 3.17.0))
+    get_target_property(target_sources ${TARGET_NAME} INTERFACE_SOURCES)
+    if(target_sources)
+      list(APPEND all_sources ${target_sources})
    endif()
  else()
-    get_target_property(__s2 ${TARGET_NAME} SOURCES)
-    if(__s2)
-      list(APPEND __all_sources ${__s2})
+    get_target_property(target_sources ${TARGET_NAME} SOURCES)
+    if(target_sources)
+      list(APPEND all_sources ${target_sources})
    endif()
  endif()

-  foreach(iter ${__all_sources})
+  foreach(iter ${all_sources})
    string(FIND ${iter} ${CMAKE_BINARY_DIR} pos)
    if(pos EQUAL -1)
-      list(APPEND __sources ${iter})
+      list(APPEND sources ${iter})
    endif()
  endforeach()

-  target_sources(${TARGET_NAME} PRIVATE ${ARG_CONFIG})
-  set(__fixed_config ${PROJECT_BINARY_DIR}/uncrustify-${TARGET_NAME}.cfg)
-  add_custom_command(OUTPUT ${__fixed_config}
+  set(fixed_config ${PROJECT_BINARY_DIR}/uncrustify-${TARGET_NAME}.cfg)
+  add_custom_command(OUTPUT ${fixed_config}
                     DEPENDS ${ARG_CONFIG}
                     COMMAND ${UNCRUSTIFY_EXE} --update-config-with-doc
-                                               -c ${ARG_CONFIG} -o ${__fixed_config})
-  list(APPEND __options -c ${__fixed_config})
+                                               -c ${ARG_CONFIG} -o ${fixed_config})
+  list(APPEND options -c ${fixed_config})
  # cmake-format: off
  add_custom_target(${TARGET_NAME}-uncrustify-check
-    DEPENDS ${__fixed_config}
-    COMMAND ${UNCRUSTIFY_EXE} ${__options} --check ${__sources})
+    DEPENDS ${fixed_config}
+    COMMAND ${UNCRUSTIFY_EXE} ${options} --check ${sources})

-  list(APPEND __options --replace --no-backup)
+  list(APPEND options --replace --no-backup)
  add_custom_target(${TARGET_NAME}-uncrustify
-    DEPENDS ${__fixed_config}
-    COMMAND ${UNCRUSTIFY_EXE} ${__options} --mtime ${__sources})
+    DEPENDS ${fixed_config}
+    COMMAND ${UNCRUSTIFY_EXE} ${options} --mtime ${sources})

  add_custom_target(${TARGET_NAME}-uncrustify-append-comments
-    DEPENDS ${__fixed_config}
-    COMMAND ${UNCRUSTIFY_EXE} ${__options}
+    DEPENDS ${fixed_config}
+    COMMAND ${UNCRUSTIFY_EXE} ${options}
            --set cmt_insert_class_header=${CMAKE_CURRENT_FUNCTION_LIST_DIR}/classheader.txt
            --set cmt_insert_file_footer=${CMAKE_CURRENT_FUNCTION_LIST_DIR}/filefooter.txt
            --set cmt_insert_file_header=${CMAKE_CURRENT_FUNCTION_LIST_DIR}/fileheader.txt
            --set cmt_insert_func_header=${CMAKE_CURRENT_FUNCTION_LIST_DIR}/funcheader.txt
-            --set cmt_insert_before_ctor_dtor=true --mtime ${__sources})
+            --set cmt_insert_before_ctor_dtor=true --mtime ${sources})
  # cmake-format: on

  add_dependencies(myx-uncrustify ${TARGET_NAME}-uncrustify)
--- a/cmake/myx_setup.cmake
+++ b/cmake/myx_setup.cmake
@ -20,11 +20,11 @@ if(ENV{MYX_CMAKE_DIR})
  set(MYX_CMAKE_DIR $ENV{MYX_CMAKE_DIR})
 endif()
 if(MYX_CMAKE_DIR)
-  find_package(MyxCMake 2.3.8 REQUIRED CONFIG PATHS ${MYX_CMAKE_DIR} NO_DEFAULT_PATH)
+  find_package(MyxCMake 2.4.37 REQUIRED CONFIG PATHS ${MYX_CMAKE_DIR} NO_DEFAULT_PATH)
  myx_message_notice("== MyxCMake directory: ${MyxCMake_CONFIG} ==")
 else()
  if(MYX_CMAKE_USE_SYSTEM)
-    find_package(MyxCMake 2.3.8 REQUIRED)
+    find_package(MyxCMake 2.4.37 REQUIRED)
    myx_message_notice("== MyxCMake directory: ${MyxCMake_CONFIG} ==")
  else()
    include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)
--- a/src/myx-example-qt-console/main.cpp
+++ b/src/myx-example-qt-console/main.cpp
@ -0,0 +1,22 @@
+#include "config_p.hpp"
+#include "git_info_p.hpp"
+
+#include <QCoreApplication>
+#include <QDebug>
+#if QT_VERSION >= 0x051000
+#include <QtCore/private/minimum-linux_p.h>
+#endif
+
+int main( int argc, char** argv )
+{
+	QCoreApplication app( argc, argv );
+
+	#if QT_VERSION >= 0x051000
+	qDebug() << QString( "Qt version: %1.%2.%3" ).arg( QT_VERSION_MAJOR ).arg( QT_VERSION_MINOR ).arg( QT_VERSION_PATCH );
+	qDebug() << QString( "Min Linux: %1.%2.%3" ).arg( MINLINUX_MAJOR ).arg( MINLINUX_MINOR ).arg( MINLINUX_PATCH );
+	#else
+	qDebug() << QString( "Qt version: %1" ).arg( QT_VERSION_STR );
+	#endif
+
+	return( 0 );
+}
--- a/uncrustify.cfg
+++ b/uncrustify.cfg
@ -1,4 +1,4 @@
-# Uncrustify-0.77.1_f
+# Uncrustify-0.78.0_f

 #
 # General options
@ -99,6 +99,12 @@ sp_cpp_lambda_square_paren      = remove   # ignore/add/remove/force/not_defined
 # no argument list is present, as in '[] <here> { ... }'.
 sp_cpp_lambda_square_brace      = ignore   # ignore/add/remove/force/not_defined

+# Add or remove space after the opening parenthesis and before the closing
+# parenthesis of a argument list of a C++11 lambda, as in
+# '[]( <here> ){ ... }'
+# with an empty list.
+sp_cpp_lambda_argument_list_empty = ignore   # ignore/add/remove/force/not_defined
+
 # Add or remove space after the opening parenthesis and before the closing
 # parenthesis of a argument list of a C++11 lambda, as in
 # '[]( <here> int x <here> ){ ... }'.
@ -195,6 +201,25 @@ sp_before_ptr_star              = remove   # ignore/add/remove/force/not_defined
 # variable name. If set to ignore, sp_before_ptr_star is used instead.
 sp_before_unnamed_ptr_star      = remove   # ignore/add/remove/force/not_defined

+# Add or remove space before pointer star '*' that is followed by a qualifier.
+# If set to ignore, sp_before_unnamed_ptr_star is used instead.
+sp_before_qualifier_ptr_star    = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space before pointer star '*' that is followed by 'operator' keyword.
+# If set to ignore, sp_before_unnamed_ptr_star is used instead.
+sp_before_operator_ptr_star     = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space before pointer star '*' that is followed by
+# a class scope (as in 'int *MyClass::method()') or namespace scope
+# (as in 'int *my_ns::func()').
+# If set to ignore, sp_before_unnamed_ptr_star is used instead.
+sp_before_scope_ptr_star        = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space before pointer star '*' that is followed by '::',
+# as in 'int *::func()'.
+# If set to ignore, sp_before_unnamed_ptr_star is used instead.
+sp_before_global_scope_ptr_star = ignore   # ignore/add/remove/force/not_defined
+
 # Add or remove space between a qualifier and a pointer star '*' that isn't
 # followed by a variable name, as in '(char const *)'. If set to ignore,
 # sp_before_ptr_star is used instead.
@ -203,6 +228,9 @@ sp_qualifier_unnamed_ptr_star   = ignore   # ignore/add/remove/force/not_defined
 # Add or remove space between pointer stars '*', as in 'int ***a;'.
 sp_between_ptr_star             = remove   # ignore/add/remove/force/not_defined

+# Add or remove space between pointer star '*' and reference '&', as in 'int *& a;'.
+sp_between_ptr_ref              = ignore   # ignore/add/remove/force/not_defined
+
 # Add or remove space after pointer star '*', if followed by a word.
 #
 # Overrides sp_type_func.
@ -313,6 +341,7 @@ sp_before_angle                 = ignore   # ignore/add/remove/force/not_defined
 sp_inside_angle                 = force    # ignore/add/remove/force/not_defined

 # Add or remove space inside '<>'.
+# if empty.
 sp_inside_angle_empty           = ignore   # ignore/add/remove/force/not_defined

 # Add or remove space between '>' and ':'.
@ -449,6 +478,7 @@ sp_cpp_before_struct_binding    = ignore   # ignore/add/remove/force/not_defined
 sp_inside_square                = ignore   # ignore/add/remove/force/not_defined

 # Add or remove space inside '[]'.
+# if empty.
 sp_inside_square_empty          = remove   # ignore/add/remove/force/not_defined

 # (OC) Add or remove space inside a non-empty Objective-C boxed array '@[' and
@ -607,6 +637,7 @@ sp_inside_type_brace_init_lst   = ignore   # ignore/add/remove/force/not_defined
 sp_inside_braces                = force    # ignore/add/remove/force/not_defined

 # Add or remove space inside '{}'.
+# if empty.
 sp_inside_braces_empty          = remove   # ignore/add/remove/force/not_defined

 # Add or remove space around trailing return operator '->'.
@ -624,7 +655,7 @@ sp_type_brace_init_lst          = ignore   # ignore/add/remove/force/not_defined
 sp_func_proto_paren             = remove   # ignore/add/remove/force/not_defined

 # Add or remove space between function name and '()' on function declaration
-# without parameters.
+# if empty.
 sp_func_proto_paren_empty       = remove   # ignore/add/remove/force/not_defined

 # Add or remove space between function name and '(' with a typedef specifier.
@ -634,7 +665,7 @@ sp_func_type_paren              = ignore   # ignore/add/remove/force/not_defined
 sp_func_def_paren               = remove   # ignore/add/remove/force/not_defined

 # Add or remove space between function name and '()' on function definition
-# without parameters.
+# if empty.
 sp_func_def_paren_empty         = remove   # ignore/add/remove/force/not_defined

 # Add or remove space inside empty function '()'.
@ -1083,6 +1114,12 @@ sp_after_noexcept               = ignore   # ignore/add/remove/force/not_defined
 # Add or remove space after '_'.
 sp_vala_after_translation       = ignore   # ignore/add/remove/force/not_defined

+# Add or remove space before a bit colon ':'.
+sp_before_bit_colon             = force    # ignore/add/remove/force/not_defined
+
+# Add or remove space after a bit colon ':'.
+sp_after_bit_colon              = force    # ignore/add/remove/force/not_defined
+
 # If true, a <TAB> is inserted after #define.
 force_tab_after_define          = false    # true/false

@ -2313,8 +2350,21 @@ nl_after_func_class_proto_group = 0        # unsigned number
 nl_class_leave_one_liner_groups = false    # true/false

 # The number of newlines after '}' of a multi-line function body.
+#
+# Overrides nl_min_after_func_body and nl_max_after_func_body.
 nl_after_func_body              = 3        # unsigned number

+# The minimum number of newlines after '}' of a multi-line function body.
+#
+# Only works when nl_after_func_body is 0.
+nl_min_after_func_body          = 0        # unsigned number
+
+# The maximum number of newlines after '}' of a multi-line function body.
+#
+# Only works when nl_after_func_body is 0.
+# Takes precedence over nl_min_after_func_body.
+nl_max_after_func_body          = 0        # unsigned number
+
 # The number of newlines after '}' of a multi-line function body in a class
 # declaration. Also affects class constructors/destructors.
 #
@ -2818,6 +2868,13 @@ align_right_cmt_at_col          = 1        # unsigned number
 # 0: Don't align (default).
 align_func_proto_span           = 0        # unsigned number

+# Whether to ignore continuation lines when evaluating the number of
+# new lines for the function prototype alignment's span.
+#
+# false: continuation lines are part of the newlines count
+# true:  continuation lines are not counted
+align_func_proto_span_ignore_cont_lines = false    # true/false
+
 # How to consider (or treat) the '*' in the alignment of function prototypes.
 #
 # 0: Part of the type     'void *   foo();' (default)
@ -2878,6 +2935,12 @@ align_oc_msg_spec_span          = 0        # unsigned number
 # 3: Align with the backslash that is farthest to the right
 align_nl_cont                   = 0        # unsigned number

+# The minimum number of spaces between the end of a line and its continuation
+# backslash. Requires align_nl_cont.
+#
+# Default: 1
+align_nl_cont_spaces            = 1        # unsigned number
+
 # Whether to align macro functions and variables together.
 align_pp_define_together        = false    # true/false

@ -3582,6 +3645,11 @@ debug_sort_the_tracks           = true     # true/false
 # only if the -p option is set.
 debug_decode_the_flags          = false    # true/false

+# use (or not) the exit(EX_SOFTWARE) function.
+#
+# Default: true
+debug_use_the_exit_function_pop = true     # true/false
+
 # insert the number of the line at the beginning of each line
 set_numbering_for_html_output   = false    # true/false

@ -3637,5 +3705,5 @@ set_numbering_for_html_output   = false    # true/false
 #       `macro-close END_MESSAGE_MAP`
 #
 #
-# option(s) with 'not default' value: 217
+# option(s) with 'not default' value: 219
 #
Author	SHA1	Message	Date
Andrey Astafyev	361d78b1cc	QT_VERSION_STR для старых версий Qt	2024-04-08 22:38:24 +03:00
Andrey Astafyev	4adeb9ab23	Совместимость с Смоленск 1.5	2024-04-08 22:27:13 +03:00
Andrey Astafyev	f9a1850944	CI/CD	2024-04-08 22:22:02 +03:00
Andrey Astafyev	37534b5a5b	Обновление MyxCMake	2024-04-08 21:48:29 +03:00
Andrei Astafev	fd8d726619	Обновление MyxCMake	2024-03-28 11:08:34 +03:00
Andrei Astafev	24436a3122	Обновление MyxCMake	2023-08-17 12:18:38 +03:00
Andrei Astafev	a07fe23f7e	Обновление MyxCMake	2023-08-02 12:21:15 +03:00
Andrey Astafyev	b931cdaf37	Правка кода	2023-07-30 16:22:49 +03:00
Andrey Astafyev	348ac4ba85	Обновление MyxCMake	2023-07-30 15:53:38 +03:00