2.4.42

2.4.41
2.4.40
2024-04-10 23:22:41 +03:00 · 2024-04-10 23:18:41 +03:00 · 2024-04-10 23:16:37 +03:00 · 2024-04-10 23:14:04 +03:00 · 2024-04-10 23:12:29 +03:00 · 2024-04-08 22:49:13 +03:00
51 changed files with 1334 additions and 949 deletions
--- a/21
+++ b/21
@ -3,8 +3,10 @@ TOP_DIR:=$(shell pwd)
 BUILD_DIR:=$(TOP_DIR)/build
 DEB_DIR:=$(BUILD_DIR)/deb/myx-cmake-$(V)
 PACK_DIR:=$(BUILD_DIR)/pack/myx-cmake-$(V)
+UNITY_DIR:=$(BUILD_DIR)/unity
+UNITY_V_DIR:=$(BUILD_DIR)/myx-cmake-unity-$(V)

-all: v deb pack
+all: v deb pack unity

 v:
 	sed -i "s/\/[0-9][0-9.]\+/\/$V/g" $(TOP_DIR)/README.md
@ -13,6 +15,7 @@ v:
 	sed -i "s/VERSION \".*\"/VERSION \"$V\"/" $(TOP_DIR)/MyxCMake/MyxCMakeConfigVersion.cmake
 	sed -i "s/VERSION .* LANG/VERSION $V LANG/" $(TOP_DIR)/debian/CMakeLists.txt
 	sed -i "s/(.*)/($(V))/" $(TOP_DIR)/debian/changelog
+	git commit -a -m "$(V)"

 deb:
 	rm -rf $(DEB_DIR)
@ -30,12 +33,22 @@ pack:
 	cp -ap $(TOP_DIR)/myx_setup.cmake $(PACK_DIR)
 	cd $(PACK_DIR); tar acf $(BUILD_DIR)/myx-cmake-local-$(V).tar.xz *

+unity:
+	rm -rf $(UNITY_DIR)
+	rm -rf $(UNITY_V_DIR)
+	mkdir -p $(UNITY_DIR)
+	python3 myx-unity.py > $(UNITY_DIR)/m.cmake
+	mv $(UNITY_DIR)/m.cmake $(UNITY_DIR)/myx/MyxCMakeConfig.cmake
+	mv $(UNITY_DIR) $(UNITY_V_DIR)
+	cd $(UNITY_V_DIR); tar acf $(BUILD_DIR)/myx-cmake-unity-$(V).tar.xz *
+
 upload:
 	git tag $(V)
-	tea r c --repo cmake/myx -t $(V) --tag $(V) \
+	gitea-tea r c --repo cmake/myx -t $(V) --tag $(V) \
 		-a $(BUILD_DIR)/myx-cmake_$(V).dsc \
 		-a $(BUILD_DIR)/myx-cmake_$(V).tar.xz \
 		-a $(BUILD_DIR)/myx-cmake_$(V)_all.deb \
-		-a $(BUILD_DIR)/myx-cmake-local-$(V).tar.xz
+		-a $(BUILD_DIR)/myx-cmake-local-$(V).tar.xz \
+		-a $(BUILD_DIR)/myx-cmake-unity-$(V).tar.xz
 	git tag -d $(V)
-	git push
+	git push --all
--- a/MyxCMake/MyxCMakeConfig.cmake
+++ b/MyxCMake/MyxCMakeConfig.cmake
@ -1,7 +1,15 @@
 cmake_policy(PUSH)
 cmake_policy(SET CMP0057 NEW) # IN_LIST operator

-# Каталог для модулей, выполняющих поиск библиотек
+# CMake выполняет проверку системного окружения с помощью модулей,
+# расположенных в следующих каталогах:
+# /usr/share/cmake-${CMAKE_VERSION}/Modules
+# /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/cmake
+# /usr/lib/cmake
+# Если для используемой программы или библиотеки нет стандартного
+# модуля для поиска, то можно использовать собственный.
+# С помощью переменной `CMAKE_MODULE_PATH` указывается перечень
+# дополнительных каталогов, в которых производится поиск модулей.
 set(MYX_CMAKE_FIND_DIR "${PROJECT_SOURCE_DIR}/cmake/find")
 if(IS_DIRECTORY "${MYX_CMAKE_FIND_DIR}")
  if(NOT ${MYX_CMAKE_FIND_DIR} IN_LIST CMAKE_MODULE_PATH)
@ -14,28 +22,28 @@ get_filename_component(MYX_CMAKE_SOURCE_DIR "${CMAKE_CURRENT_LIST_FILE}" DIRECTO
 set(MYX_CMAKE_BACKPORTS_DIR "${MYX_CMAKE_SOURCE_DIR}/backports")
 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.9.0")
-  include(${MYX_CMAKE_BACKPORTS_DIR}/CheckIPOSupported.cmake)
-else()
-  include(CheckIPOSupported)
-endif()
-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)
 endif()

+# Загрузка стандартных модулей
 include(GNUInstallDirs)
 include(CMakeDependentOption)

-include(${MYX_CMAKE_LIB_DIR}/macro/SkipExternalTarget.cmake)
+# Полезные макросы
 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)
@ -43,15 +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}/FetchContentAdd.cmake)
+include(${MYX_CMAKE_LIB_DIR}/DownloadContent.cmake)

-include(${MYX_CMAKE_LIB_DIR}/LSBInfo.cmake)
-include(${MYX_CMAKE_LIB_DIR}/Toolchain.cmake)
-include(${MYX_CMAKE_LIB_DIR}/CompilerFlags.cmake)
+include(${MYX_CMAKE_LIB_DIR}/Toolchains.cmake)
 include(${MYX_CMAKE_LIB_DIR}/AddExecutable.cmake)
-include(${MYX_CMAKE_LIB_DIR}/AddLibrary.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)
@ -59,6 +66,7 @@ include(${MYX_CMAKE_LIB_DIR}/doc/Doxygen.cmake)
 include(${MYX_CMAKE_LIB_DIR}/generators/PrivateConfigHeader.cmake)
 include(${MYX_CMAKE_LIB_DIR}/generators/GitInfoHeader.cmake)

+include(${MYX_CMAKE_LIB_DIR}/CreatePackages.cmake)
 include(${MYX_CMAKE_LIB_DIR}/Uninstall.cmake)

 unset(MYX_CMAKE_SOURCE_DIR)
--- a/MyxCMake/MyxCMakeConfigVersion.cmake
+++ b/MyxCMake/MyxCMakeConfigVersion.cmake
@ -1,4 +1,4 @@
-set(MYX_CMAKE_PACKAGE_VERSION "2.0.14")
+set(MYX_CMAKE_PACKAGE_VERSION "2.4.42")
 if(MYX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
  set(PACKAGE_VERSION_COMPATIBLE FALSE)
 else()
--- a/MyxCMake/backports/CheckIPOSupported.cmake
+++ b/MyxCMake/backports/CheckIPOSupported.cmake
@ -1,186 +0,0 @@
-# X_RESULT - name of the final result variable
-# X_OUTPUT - name of the variable with information about error
-macro(_ipo_not_supported output)
-  if(NOT X_RESULT)
-    message(FATAL_ERROR "IPO is not supported (${output}).")
-  endif()
-
-  set("${X_RESULT}" NO PARENT_SCOPE)
-  if(X_OUTPUT)
-    set("${X_OUTPUT}" "${output}" PARENT_SCOPE)
-  endif()
-endmacro()
-
-# Run IPO/LTO test
-macro(_ipo_run_language_check language)
-  set(testdir "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/_CMakeLTOTest-${language}")
-
-  file(REMOVE_RECURSE "${testdir}")
-  file(MAKE_DIRECTORY "${testdir}")
-
-  set(bindir "${testdir}/bin")
-  set(srcdir "${testdir}/src")
-
-  file(MAKE_DIRECTORY "${bindir}")
-  file(MAKE_DIRECTORY "${srcdir}")
-
-  set(TRY_COMPILE_PROJECT_NAME "lto-test")
-
-  set(try_compile_src "${CMAKE_ROOT}/Modules/CheckIPOSupported")
-
-  # Use:
-  # * TRY_COMPILE_PROJECT_NAME
-  # * CMAKE_VERSION
-  configure_file(
-      "${try_compile_src}/CMakeLists-${language}.txt.in"
-      "${srcdir}/CMakeLists.txt"
-      @ONLY
-  )
-
-  string(COMPARE EQUAL "${language}" "C" is_c)
-  string(COMPARE EQUAL "${language}" "CXX" is_cxx)
-  string(COMPARE EQUAL "${language}" "Fortran" is_fortran)
-
-  if(is_c)
-    set(copy_sources foo.c main.c)
-  elseif(is_cxx)
-    set(copy_sources foo.cpp main.cpp)
-  elseif(is_fortran)
-    set(copy_sources foo.f main.f)
-  else()
-    message(FATAL_ERROR "Language not supported")
-  endif()
-
-  foreach(x ${copy_sources})
-    configure_file(
-        "${try_compile_src}/${x}"
-        "${srcdir}/${x}"
-        COPYONLY
-    )
-  endforeach()
-
-  try_compile(
-      _IPO_LANGUAGE_CHECK_RESULT
-      "${bindir}"
-      "${srcdir}"
-      "${TRY_COMPILE_PROJECT_NAME}"
-      CMAKE_FLAGS
-      "-DCMAKE_VERBOSE_MAKEFILE=ON"
-      "-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON"
-      OUTPUT_VARIABLE output
-  )
-  set(_IPO_LANGUAGE_CHECK_RESULT "${_IPO_LANGUAGE_CHECK_RESULT}")
-  unset(_IPO_LANGUAGE_CHECK_RESULT CACHE)
-
-  if(NOT _IPO_LANGUAGE_CHECK_RESULT)
-    file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
-      "${language} compiler IPO check failed with the following output:\n"
-      "${output}\n")
-    _ipo_not_supported("check failed to compile")
-    if(X_OUTPUT)
-      set("${X_OUTPUT}" "${output}" PARENT_SCOPE)
-    endif()
-    return()
-  endif()
-endmacro()
-
-function(check_ipo_supported)
-  cmake_policy(GET CMP0069 x)
-
-  string(COMPARE EQUAL "${x}" "" not_set)
-  if(not_set)
-    message(FATAL_ERROR "Policy CMP0069 is not set")
-  endif()
-
-  string(COMPARE EQUAL "${x}" "OLD" is_old)
-  if(is_old)
-    message(FATAL_ERROR "Policy CMP0069 set to OLD")
-  endif()
-
-  set(optional)
-  set(one RESULT OUTPUT)
-  set(multiple LANGUAGES)
-
-  # Introduce:
-  # * X_RESULT
-  # * X_OUTPUT
-  # * X_LANGUAGES
-  cmake_parse_arguments(X "${optional}" "${one}" "${multiple}" "${ARGV}")
-
-  string(COMPARE NOTEQUAL "${X_UNPARSED_ARGUMENTS}" "" has_unparsed)
-  if(has_unparsed)
-    message(FATAL_ERROR "Unparsed arguments: ${X_UNPARSED_ARGUMENTS}")
-  endif()
-
-  string(COMPARE EQUAL "${X_LANGUAGES}" "" no_languages)
-  if(no_languages)
-    # User did not set any languages, use defaults
-    get_property(enabled_languages GLOBAL PROPERTY ENABLED_LANGUAGES)
-    string(COMPARE EQUAL "${enabled_languages}" "" no_languages)
-    if(no_languages)
-      _ipo_not_supported(
-          "no languages found in ENABLED_LANGUAGES global property"
-      )
-      return()
-    endif()
-
-    set(languages "")
-    list(FIND enabled_languages "CXX" result)
-    if(NOT result EQUAL -1)
-      list(APPEND languages "CXX")
-    endif()
-
-    list(FIND enabled_languages "C" result)
-    if(NOT result EQUAL -1)
-      list(APPEND languages "C")
-    endif()
-
-    list(FIND enabled_languages "Fortran" result)
-    if(NOT result EQUAL -1)
-      list(APPEND languages "Fortran")
-    endif()
-
-    string(COMPARE EQUAL "${languages}" "" no_languages)
-    if(no_languages)
-      _ipo_not_supported(
-          "no C/CXX/Fortran languages found in ENABLED_LANGUAGES global property"
-      )
-      return()
-    endif()
-  else()
-    set(languages "${X_LANGUAGES}")
-
-    set(unsupported_languages "${languages}")
-    list(REMOVE_ITEM unsupported_languages "C" "CXX" "Fortran")
-    string(COMPARE NOTEQUAL "${unsupported_languages}" "" has_unsupported)
-    if(has_unsupported)
-      _ipo_not_supported(
-          "language(s) '${unsupported_languages}' not supported"
-      )
-      return()
-    endif()
-  endif()
-
-  foreach(lang ${languages})
-    if(NOT _CMAKE_${lang}_IPO_SUPPORTED_BY_CMAKE)
-      _ipo_not_supported("CMake doesn't support IPO for current ${lang} compiler")
-      return()
-    endif()
-
-    if(NOT _CMAKE_${lang}_IPO_MAY_BE_SUPPORTED_BY_COMPILER)
-      _ipo_not_supported("${lang} compiler doesn't support IPO")
-      return()
-    endif()
-  endforeach()
-
-  if(CMAKE_GENERATOR MATCHES "^Visual Studio 9 ")
-    _ipo_not_supported("CMake doesn't support IPO for current generator")
-    return()
-  endif()
-
-  foreach(x ${languages})
-    _ipo_run_language_check(${x})
-  endforeach()
-
-  set("${X_RESULT}" YES PARENT_SCOPE)
-endfunction()
--- a/MyxCMake/backports/CheckIPOSupported/CMakeLists-C.txt.in
+++ b/MyxCMake/backports/CheckIPOSupported/CMakeLists-C.txt.in
@ -1,8 +0,0 @@
-cmake_minimum_required(VERSION "@CMAKE_VERSION@")
-project("@TRY_COMPILE_PROJECT_NAME@" LANGUAGES C)
-
-cmake_policy(SET CMP0069 NEW)
-
-add_library(foo foo.c)
-add_executable(boo main.c)
-target_link_libraries(boo PUBLIC foo)
--- a/MyxCMake/backports/CheckIPOSupported/CMakeLists-CXX.txt.in
+++ b/MyxCMake/backports/CheckIPOSupported/CMakeLists-CXX.txt.in
@ -1,8 +0,0 @@
-cmake_minimum_required(VERSION "@CMAKE_VERSION@")
-project("@TRY_COMPILE_PROJECT_NAME@" LANGUAGES CXX)
-
-cmake_policy(SET CMP0069 NEW)
-
-add_library(foo foo.cpp)
-add_executable(boo main.cpp)
-target_link_libraries(boo PUBLIC foo)
--- a/MyxCMake/backports/CheckIPOSupported/CMakeLists-Fortran.txt.in
+++ b/MyxCMake/backports/CheckIPOSupported/CMakeLists-Fortran.txt.in
@ -1,8 +0,0 @@
-cmake_minimum_required(VERSION "@CMAKE_VERSION@")
-project("@TRY_COMPILE_PROJECT_NAME@" LANGUAGES Fortran)
-
-cmake_policy(SET CMP0069 NEW)
-
-add_library(foo foo.f)
-add_executable(boo main.f)
-target_link_libraries(boo PUBLIC foo)
--- a/MyxCMake/backports/CheckIPOSupported/foo.c
+++ b/MyxCMake/backports/CheckIPOSupported/foo.c
@ -1,4 +0,0 @@
-int foo()
-{
-  return 0x42;
-}
--- a/MyxCMake/backports/CheckIPOSupported/foo.cpp
+++ b/MyxCMake/backports/CheckIPOSupported/foo.cpp
@ -1,4 +0,0 @@
-int foo()
-{
-  return 0x42;
-}
--- a/MyxCMake/backports/CheckIPOSupported/foo.f
+++ b/MyxCMake/backports/CheckIPOSupported/foo.f
@ -1,2 +0,0 @@
-	SUBROUTINE FOO
-	END
--- a/MyxCMake/backports/CheckIPOSupported/main.c
+++ b/MyxCMake/backports/CheckIPOSupported/main.c
@ -1,6 +0,0 @@
-int foo();
-
-int main()
-{
-  return foo();
-}
--- a/MyxCMake/backports/CheckIPOSupported/main.cpp
+++ b/MyxCMake/backports/CheckIPOSupported/main.cpp
@ -1,6 +0,0 @@
-int foo();
-
-int main()
-{
-  return foo();
-}
--- a/MyxCMake/backports/CheckIPOSupported/main.f
+++ b/MyxCMake/backports/CheckIPOSupported/main.f
@ -1,3 +0,0 @@
-	PROGRAM BOO
-	CALL FOO()
-	END
--- a/MyxCMake/backports/IncludeGuard.cmake
+++ b/MyxCMake/backports/IncludeGuard.cmake
@ -3,7 +3,7 @@
 # Макрос реализован для обратной совместимости
 if(${CMAKE_VERSION} VERSION_LESS "3.10.0")
  macro(include_guard)
-    if (CMAKE_FILE_${CMAKE_CURRENT_LIST_FILE}_ALREADY_INCLUDED)
+    if(CMAKE_FILE_${CMAKE_CURRENT_LIST_FILE}_ALREADY_INCLUDED)
      return()
    endif()
    set(CMAKE_FILE_${CMAKE_CURRENT_LIST_FILE}_ALREADY_INCLUDED TRUE)
--- a/MyxCMake/backports/TopLevelProject.cmake
+++ b/MyxCMake/backports/TopLevelProject.cmake
@ -1,10 +0,0 @@
-include_guard(GLOBAL)
-
-if(${CMAKE_VERSION} VERSION_LESS 3.21)
-  get_property(nt DIRECTORY PROPERTY PARENT_DIRECTORY)
-  if(NOT nt)
-    set(PROJECT_IS_TOP_LEVEL true)
-  endif()
-  unset(nt)
-endif()
-
--- a/MyxCMake/lib/AddExecutable.cmake
+++ b/MyxCMake/lib/AddExecutable.cmake
@ -4,7 +4,7 @@ myx_add_executable

 Вспомогательная функция для создания исполняемого файла::

-    myx_add_executable(NAME)
+  myx_add_executable(TARGET_NAME)

 Используется для совместимости с версиями CMake раньше 3.11,
 в которых было необходимо указать хотя бы один файл с исходными текстами.
@ -13,10 +13,10 @@ myx_add_executable

 include_guard(GLOBAL)

-function(myx_add_executable NAME)
-  if(${CMAKE_VERSION} VERSION_LESS "3.11.0")
-    add_executable(${NAME} ${ARGN} "")
+function(myx_add_executable TARGET_NAME)
+  if(${CMAKE_VERSION} VERSION_LESS 3.11.0)
+    add_executable(${TARGET_NAME} ${ARGN} "")
  else()
-    add_executable(${NAME} ${ARGN})
+    add_executable(${TARGET_NAME} ${ARGN})
  endif()
 endfunction()
--- a/MyxCMake/lib/AddInterfaceLibrary.cmake
+++ b/MyxCMake/lib/AddInterfaceLibrary.cmake
@ -0,0 +1,174 @@
+#[=======================================================================[.rst:
+myx_add_interface_library
+-------------------------
+
+Вспомогательная функция для создания интерфейсной библиотеки::
+
+    myx_add_interface_library(TARGET_NAME
+      [ PACKAGES packages ] |
+      [ LINK_LIBRARIES link_libraries ] |
+      [ OUTPUT_NAME output_name ] |
+      [ HEADERS headers ])
+
+Обязательные параметры: `TARGET_NAME` - имя библиотеки.
+Параметр `OUTPUT_NAME` определяет базовое имя выходных файлов.
+Все остальные параметры передаются в стандартную функцию `add_library()`
+
+#]=======================================================================]
+
+include_guard(GLOBAL)
+
+include(CMakePackageConfigHelpers)
+
+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)
+    set(CMAKE_CURRENT_FUNCTION_LIST_DIR ${MYX_CMAKE_LIB_DIR_BACKPORT})
+  endif()
+
+  if(TARGET ${TARGET_NAME})
+    myx_message_fatal_error("Target ${TARGET_NAME} already exists")
+  endif()
+
+  set(options)
+  set(oneValueArgs OUTPUT_NAME)
+  set(multiValueArgs HEADERS LINK_LIBRARIES PACKAGES)
+  cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+  if(NOT ARG_OUTPUT_NAME)
+    set(ARG_OUTPUT_NAME ${TARGET_NAME})
+  endif()
+
+  # Вызов стандартной функции `add_library()`
+  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})
+  endforeach()
+
+  if(ARG_LINK_LIBRARIES)
+    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()
+
+  # Библиотека, состоящая только из заголовочных файлов не требует сборки.
+  # Стандартные пути к заголовочным файлам
+  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)
+      set_target_properties(${TARGET_NAME} PROPERTIES EXCLUDE_FROM_ALL True)
+    else()
+      set_target_properties(${TARGET_NAME} PROPERTIES INTERFACE_EXCLUDE_FROM_ALL True)
+    endif()
+    return()
+  endif()
+
+  # Правила для установки библиотек и относящихся к ним файлов.
+  # Если вызов был выполнен не из проекта верхнего уровня,
+  # то эти правила не обрабатываются.
+  write_basic_package_version_file(
+    ${CMAKE_CURRENT_BINARY_DIR}/${TARGET_NAME}ConfigVersion.cmake
+    VERSION ${PROJECT_VERSION}
+    COMPATIBILITY AnyNewerVersion
+  )
+
+  configure_package_config_file(
+    ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/library-config.cmake.in
+    ${CMAKE_CURRENT_BINARY_DIR}/${TARGET_NAME}Config.cmake
+    INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${TARGET_NAME}
+    NO_SET_AND_CHECK_MACRO
+    NO_CHECK_REQUIRED_COMPONENTS_MACRO
+  )
+
+  if(${CMAKE_VERSION} VERSION_GREATER 3.13)
+    install(
+      EXPORT ${TARGET_NAME}Targets
+      DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${TARGET_NAME}
+      COMPONENT DEV)
+  endif()
+
+  install(
+    FILES
+      ${PROJECT_BINARY_DIR}/${TARGET_NAME}ConfigVersion.cmake
+      ${PROJECT_BINARY_DIR}/${TARGET_NAME}Config.cmake
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${TARGET_NAME}
+    COMPONENT DEV)
+
+  # Формирование файла для pkg-config
+  file(WRITE "${PROJECT_BINARY_DIR}/${TARGET_NAME}.pc"
+    "prefix=${CMAKE_INSTALL_PREFIX}\n"
+    "exec_prefix=${CMAKE_INSTALL_PREFIX}\n"
+    "includedir=${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}\n"
+    "\n"
+    "Name: ${TARGET_NAME}\n"
+    "Description: ${TARGET_NAME} library\n"
+    "Version: ${PROJECT_VERSION}\n"
+    "\n"
+    "Requires:\n"
+    "Cflags: -I${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}\n")
+
+  # Установка файла для pkg-config
+  install(
+    FILES "${PROJECT_BINARY_DIR}/${TARGET_NAME}.pc"
+    DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
+    COMPONENT DEV)
+
+  # Установка библиотеки из заголовочных файлов
+  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)
+    myx_install_relative(${PROJECT_SOURCE_DIR}
+      FILES ${ARG_HEADERS}
+      DESTINATION ${CMAKE_INSTALL_PREFIX}
+      COMPONENT DEV)
+  endif()
+endfunction()
--- a/MyxCMake/lib/AddLibrary.cmake
+++ b/MyxCMake/lib/AddLibrary.cmake
@ -1,224 +0,0 @@
-#[=======================================================================[.rst:
-myx_add_library
---------------
-
-Вспомогательная функция для создания библиотеки::
-
-    myx_add_library(NAME TYPE
-      [ OUTPUT_NAME output_name ] |
-      [ EXPORT_FILE_NAME file_name ] |
-      [ EXPORT_BASE_NAME base_name ])
-
-Обязательные параметры: `NAME` - имя библиотеки и `TYPE` - тип цели.
-Параметр `OUTPUT_NAME` определяет базовое имя выходных файлов.
-Параметр `EXPORT_FILE_NAME` задаёт имя заголовочного файла экспортируемых
-переменных, а `EXPORT_BASE_NAME` - базовый суффикс для формирования имён переменных.
-Все остальные параметры передаются в стандартную функцию `add_library()`
-
-#]=======================================================================]
-
-include_guard(GLOBAL)
-
-include(CMakePackageConfigHelpers)
-include(GenerateExportHeader)
-
-if(${CMAKE_VERSION} VERSION_LESS "3.17.0")
-  set(MYX_CMAKE_LIB_DIR_BACKPORT "${CMAKE_CURRENT_LIST_DIR}")
-endif()
-
-function(myx_add_library NAME TYPE)
-  if(${CMAKE_VERSION} VERSION_LESS "3.17.0")
-    set(CMAKE_CURRENT_FUNCTION_LIST_DIR ${MYX_CMAKE_LIB_DIR_BACKPORT})
-  endif()
-
-  set(options)
-  set(oneValueArgs OUTPUT_NAME EXPORT_FILE_NAME EXPORT_BASE_NAME)
-  set(multiValueArgs)
-  cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
-  if(NOT ARG_OUTPUT_NAME)
-    set(ARG_OUTPUT_NAME ${NAME})
-  endif()
-
-  # Вызов стандартной функции `add_library()`
-  add_library(${NAME} ${TYPE} ${ARG_UNPARSED_ARGUMENTS})
-
-  if(TYPE STREQUAL "INTERFACE")
-    # Библиотека, состоящая только из заголовочных файлов не требует сборки.
-    # Стандартные пути к заголовочным файлам
-    target_include_directories(${NAME} INTERFACE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>)
-  else()
-    string(TOUPPER ${NAME} PROJECT_NAME_UPPER)
-    # Опция для разрешения сборки динамической библиотеки
-    cmake_dependent_option(${PROJECT_NAME_UPPER}_BUILD_SHARED
-      "Build shared library for ${NAME}" ON "BUILD_SHARED_LIBS" OFF)
-    # Опция для разрешения сборки статической библиотеки
-    cmake_dependent_option(${PROJECT_NAME_UPPER}_BUILD_STATIC
-      "Build static library for ${NAME}" ON "NOT BUILD_SHARED_LIBS" OFF)
-
-    # Стандартные пути к заголовочным файлам
-    target_include_directories(${NAME}
-      PUBLIC
-        $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
-      PRIVATE
-        $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>
-        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
-    )
-
-    # Сборка позиционно-независимых объектных файлов нужна
-    # для создания динамической библиотеки
-    set_target_properties(${NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
-
-    if(NOT EXPORT_BASE_NAME)
-      string(TOUPPER ${NAME} ARG_EXPORT_BASE_NAME)
-    endif()
-
-    if(NOT ARG_EXPORT_FILE_NAME)
-      set(ARG_EXPORT_FILE_NAME "${PROJECT_SOURCE_DIR}/include/${NAME}/${NAME}_export.hpp")
-    endif()
-
-    generate_export_header(${NAME}
-      BASE_NAME ${ARG_EXPORT_BASE_NAME}
-      EXPORT_MACRO_NAME "EXPORT_${ARG_EXPORT_BASE_NAME}"
-      DEPRECATED_MACRO_NAME "DEPRECATED_${ARG_EXPORT_BASE_NAME}"
-      NO_DEPRECATED_MACRO_NAME "NO_DEPRECATED_${ARG_EXPORT_BASE_NAME}"
-      NO_EXPORT_MACRO_NAME "NO_EXPORT_${ARG_EXPORT_BASE_NAME}"
-      STATIC_DEFINE "STATIC_DEFINE_${ARG_EXPORT_BASE_NAME}"
-      EXPORT_FILE_NAME ${ARG_EXPORT_FILE_NAME}
-      DEFINE_NO_DEPRECATED
-    )
-    set_property(TARGET ${NAME} APPEND PROPERTY INTERFACE_HEADER_FILES "${ARG_EXPORT_FILE_NAME}")
-
-    # Цель для создания динамической библиотеки из объектных файлов
-    if(${PROJECT_NAME_UPPER}_BUILD_SHARED)
-      # Для создания динамической библиотеки используются объектные файлы цели ${NAME}
-      add_library(${NAME}_shared SHARED $<TARGET_OBJECTS:${NAME}>)
-      # Установка дополнительных свойств для цели ${NAME}_shared
-      # VERSION:     версия библиотеки
-      # SOVERSION:   мажорная версия библиотеки
-      # LIBRARY_OUTPUT_DIRECTORY: каталог для записи результатов сборки
-      # OUTPUT_NAME: базовое имя выходного файла (без учёта расширения)
-      set_target_properties(${NAME}_shared
-        PROPERTIES
-          VERSION ${PROJECT_VERSION}
-          SOVERSION ${PROJECT_VERSION_MAJOR}
-          LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}
-          OUTPUT_NAME ${ARG_OUTPUT_NAME})
-    endif()
-
-    # Цель для создания статической библиотеки из объектных файлов
-    if(${PROJECT_NAME_UPPER}_BUILD_STATIC)
-      # Для создания статической библиотеки используются объектные файлы цели ${NAME}
-      add_library(${NAME}_static STATIC $<TARGET_OBJECTS:${NAME}>)
-      # Установка дополнительных свойств для цели ${NAME}_static
-      # ARCHIVE_OUTPUT_DIRECTORY: каталог для записи результатов сборки
-      # OUTPUT_NAME: базовое имя выходного файла (без учёта расширения)
-      set_target_properties(${NAME}_static
-        PROPERTIES
-          ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}
-          OUTPUT_NAME ${ARG_OUTPUT_NAME})
-    endif()
-  endif()
-
-  # Если вызов был выполнен не из проекта верхнего уровня,
-  # то созданная цель исключается из цели `all`.
-  # При этом сама цель `${NAME}` может участвовать в сборке,
-  # если окажется в перечне зависимостей.
-  if(NOT PROJECT_IS_TOP_LEVEL)
-    set_target_properties(${NAME} PROPERTIES EXCLUDE_FROM_ALL True)
-    return()
-  endif()
-
-  # Правила для установки библиотек и относящихся к ним файлов.
-  # Если вызов был выполнен не из проекта верхнего уровня,
-  # то эти правила не обрабатываются.
-  write_basic_package_version_file(
-    ${CMAKE_CURRENT_BINARY_DIR}/${NAME}ConfigVersion.cmake
-    VERSION ${PROJECT_VERSION}
-    COMPATIBILITY AnyNewerVersion
-  )
-
-  configure_package_config_file(
-    ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/library-config.cmake.in
-    ${CMAKE_CURRENT_BINARY_DIR}/${NAME}Config.cmake
-    INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${NAME}
-    NO_SET_AND_CHECK_MACRO
-    NO_CHECK_REQUIRED_COMPONENTS_MACRO
-  )
-
-  install(EXPORT ${NAME}Targets
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${NAME}
-    COMPONENT dev
-  )
-
-  install(
-    FILES
-      ${PROJECT_BINARY_DIR}/${NAME}ConfigVersion.cmake
-      ${PROJECT_BINARY_DIR}/${NAME}Config.cmake
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${NAME}
-    COMPONENT dev
-  )
-
-  # Формирование файла для pkg-config
-  file(WRITE "${PROJECT_BINARY_DIR}/${NAME}.pc"
-    "prefix=${CMAKE_INSTALL_PREFIX}\n"
-    "exec_prefix=${CMAKE_INSTALL_PREFIX}\n"
-    "includedir=${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}\n")
-
-  if(NOT TYPE STREQUAL "INTERFACE")
-    file(APPEND "${PROJECT_BINARY_DIR}/${NAME}.pc"
-      "libdir=${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}\n")
-  endif()
-
-  file(APPEND "${PROJECT_BINARY_DIR}/${NAME}.pc"
-    "\n"
-    "Name: ${NAME}\n"
-    "Description: ${NAME} library\n"
-    "Version: ${PROJECT_VERSION}\n"
-    "\n"
-    "Requires:\n"
-    "Cflags: -I${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}\n")
-
-  if(NOT TYPE STREQUAL "INTERFACE")
-    file(APPEND "${PROJECT_BINARY_DIR}/${NAME}.pc"
-      "Libs: -L${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR} -l${NAME}\n")
-  endif()
-
-  # Установка файла для pkg-config
-  install(
-    FILES "${PROJECT_BINARY_DIR}/${NAME}.pc"
-    COMPONENT dev
-    DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
-
-  if(TYPE STREQUAL "OBJECT")
-    # Установка динамической библиотеки
-    if(TARGET ${NAME}_shared)
-      install(
-        TARGETS ${NAME}_shared
-        EXPORT ${NAME}Targets
-        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        COMPONENT lib
-      )
-    endif()
-
-    if(TARGET ${NAME}_static)
-      # Установка статической библиотеки
-      install(
-        TARGETS ${NAME}_static
-        EXPORT ${NAME}Targets
-        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        COMPONENT static
-      )
-    endif()
-  endif()
-
-  if(TYPE STREQUAL "INTERFACE")
-    # Установка библиотеки из заголовочных файлов
-    target_include_directories(${NAME} SYSTEM INTERFACE $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
-    install(
-      TARGETS ${NAME}
-      EXPORT ${NAME}Targets
-      COMPONENT lib
-    )
-  endif()
-endfunction()
--- a/MyxCMake/lib/AddObjectLibrary.cmake
+++ b/MyxCMake/lib/AddObjectLibrary.cmake
@ -0,0 +1,199 @@
+#[=======================================================================[.rst:
+myx_add_object_library
+----------------------
+
+Вспомогательная функция для создания объектной библиотеки::
+
+    myx_add_object_library(TARGET_NAME
+      [ OUTPUT_NAME output_name ] |
+      [ NO_EXPORT ] |
+      [ EXPORT_FILE_NAME file_name ] |
+      [ EXPORT_BASE_NAME base_name ])
+
+Обязательные параметры: `TARGET_NAME` - имя библиотеки.
+Параметр `OUTPUT_NAME` определяет базовое имя выходных файлов.
+Если указана опция `NO_EXPORT`, то файл экспорта не генерируется.
+Параметр `EXPORT_FILE_NAME` задаёт имя заголовочного файла экспортируемых
+переменных, а `EXPORT_BASE_NAME` - базовый суффикс для формирования имён переменных.
+Все остальные параметры передаются в стандартную функцию `add_library()`
+
+#]=======================================================================]
+
+include_guard(GLOBAL)
+
+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)
+    set(CMAKE_CURRENT_FUNCTION_LIST_DIR ${MYX_CMAKE_LIB_DIR_BACKPORT})
+  endif()
+
+  include(CMakePackageConfigHelpers)
+
+  set(options NO_EXPORT)
+  set(oneValueArgs OUTPUT_NAME EXPORT_FILE_NAME EXPORT_BASE_NAME)
+  set(multiValueArgs)
+  cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+  if(NOT ARG_OUTPUT_NAME)
+    set(ARG_OUTPUT_NAME ${TARGET_NAME})
+  endif()
+
+  # Вызов стандартной функции `add_library()`
+  add_library(${TARGET_NAME} OBJECT ${ARG_UNPARSED_ARGUMENTS})
+
+  string(TOUPPER ${TARGET_NAME} project_name_upper)
+  # Опция для разрешения сборки динамической библиотеки
+  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
+    "Build static library for ${TARGET_NAME}" ON "NOT BUILD_SHARED_LIBS" OFF)
+
+  # Стандартные пути к заголовочным файлам
+  target_include_directories(${TARGET_NAME}
+    PUBLIC
+      $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
+    PRIVATE
+      $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>
+      $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+  )
+
+  # Сборка позиционно-независимых объектных файлов нужна
+  # для создания динамической библиотеки
+  set_target_properties(${TARGET_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
+
+  if(NOT ARG_NO_EXPORT)
+    include(GenerateExportHeader)
+    if(NOT EXPORT_BASE_NAME)
+      set(ARG_EXPORT_BASE_NAME ${project_name_upper})
+    endif()
+
+    if(NOT ARG_EXPORT_FILE_NAME)
+      set(ARG_EXPORT_FILE_NAME "${PROJECT_SOURCE_DIR}/include/${TARGET_NAME}/${TARGET_NAME}_export.hpp")
+    endif()
+
+    generate_export_header(${TARGET_NAME}
+      BASE_NAME ${ARG_EXPORT_BASE_NAME}
+      EXPORT_MACRO_NAME "EXPORT_${ARG_EXPORT_BASE_NAME}"
+      DEPRECATED_MACRO_NAME "DEPRECATED_${ARG_EXPORT_BASE_NAME}"
+      NO_DEPRECATED_MACRO_NAME "NO_DEPRECATED_${ARG_EXPORT_BASE_NAME}"
+      NO_EXPORT_MACRO_NAME "NO_EXPORT_${ARG_EXPORT_BASE_NAME}"
+      STATIC_DEFINE "STATIC_DEFINE_${ARG_EXPORT_BASE_NAME}"
+      EXPORT_FILE_NAME ${ARG_EXPORT_FILE_NAME}
+      DEFINE_NO_DEPRECATED
+    )
+    set_property(TARGET ${TARGET_NAME} APPEND PROPERTY INTERFACE_HEADER_FILES "${ARG_EXPORT_FILE_NAME}")
+  endif()
+
+  # Цель для создания динамической библиотеки из объектных файлов
+  if(${project_name_upper}_BUILD_SHARED)
+    # Для создания динамической библиотеки используются объектные файлы цели ${TARGET_NAME}
+    add_library(${TARGET_NAME}_shared SHARED $<TARGET_OBJECTS:${TARGET_NAME}>)
+    # Установка дополнительных свойств для цели ${TARGET_NAME}_shared
+    # VERSION:     версия библиотеки
+    # SOVERSION:   мажорная версия библиотеки
+    # LIBRARY_OUTPUT_DIRECTORY: каталог для записи результатов сборки
+    # OUTPUT_NAME: базовое имя выходного файла (без учёта расширения)
+    set_target_properties(${TARGET_NAME}_shared PROPERTIES
+      VERSION ${PROJECT_VERSION}
+      SOVERSION ${PROJECT_VERSION_MAJOR}
+      LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}
+      OUTPUT_NAME ${ARG_OUTPUT_NAME})
+  endif()
+
+  # Цель для создания статической библиотеки из объектных файлов
+  if(${project_name_upper}_BUILD_STATIC)
+    # Для создания статической библиотеки используются
+    # объектные файлы цели ${TARGET_NAME}
+    add_library(${TARGET_NAME}_static STATIC $<TARGET_OBJECTS:${TARGET_NAME}>)
+    # Установка дополнительных свойств для цели ${TARGET_NAME}_static
+    # ARCHIVE_OUTPUT_DIRECTORY: каталог для записи результатов сборки
+    # OUTPUT_NAME: базовое имя выходного файла (без учёта расширения)
+    set_target_properties(${TARGET_NAME}_static PROPERTIES
+      ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}
+      OUTPUT_NAME ${ARG_OUTPUT_NAME})
+  endif()
+
+  # Если вызов был выполнен не из проекта верхнего уровня,
+  # то созданная цель исключается из цели `all`.
+  # При этом сама цель `${TARGET_NAME}` может участвовать в сборке,
+  # если окажется в перечне зависимостей.
+  if(NOT PROJECT_IS_TOP_LEVEL)
+    set_target_properties(${TARGET_NAME} PROPERTIES EXCLUDE_FROM_ALL True)
+    return()
+  endif()
+
+  # Правила для установки библиотек и относящихся к ним файлов.
+  # Если вызов был выполнен не из проекта верхнего уровня,
+  # то эти правила не обрабатываются.
+  write_basic_package_version_file(
+    ${CMAKE_CURRENT_BINARY_DIR}/${TARGET_NAME}ConfigVersion.cmake
+    VERSION ${PROJECT_VERSION}
+    COMPATIBILITY AnyNewerVersion
+  )
+
+  configure_package_config_file(
+    ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/library-config.cmake.in
+    ${CMAKE_CURRENT_BINARY_DIR}/${TARGET_NAME}Config.cmake
+    INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${TARGET_NAME}
+    NO_SET_AND_CHECK_MACRO
+    NO_CHECK_REQUIRED_COMPONENTS_MACRO
+  )
+
+  install(EXPORT ${TARGET_NAME}Targets
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${TARGET_NAME}
+    COMPONENT DEV
+  )
+
+  install(
+    FILES
+      ${PROJECT_BINARY_DIR}/${TARGET_NAME}ConfigVersion.cmake
+      ${PROJECT_BINARY_DIR}/${TARGET_NAME}Config.cmake
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${TARGET_NAME}
+    COMPONENT DEV
+  )
+
+  # Формирование файла для pkg-config
+  file(WRITE "${PROJECT_BINARY_DIR}/${TARGET_NAME}.pc"
+    "prefix=${CMAKE_INSTALL_PREFIX}\n"
+    "exec_prefix=${CMAKE_INSTALL_PREFIX}\n"
+    "includedir=${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}\n"
+    "libdir=${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}\n"
+    "\n"
+    "Name: ${TARGET_NAME}\n"
+    "Description: ${TARGET_NAME} library\n"
+    "Version: ${PROJECT_VERSION}\n"
+    "\n"
+    "Requires:\n"
+    "Cflags: -I${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}\n"
+    "Libs: -L${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR} -l${TARGET_NAME}\n")
+
+  # Установка файла для pkg-config
+  install(
+    FILES "${PROJECT_BINARY_DIR}/${TARGET_NAME}.pc"
+    COMPONENT DEV
+    DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+
+  # Установка динамической библиотеки
+  if(TARGET ${TARGET_NAME}_shared)
+    install(
+      TARGETS ${TARGET_NAME}_shared
+      EXPORT ${TARGET_NAME}Targets
+      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+      COMPONENT LIB
+    )
+  endif()
+
+  # Установка статической библиотеки
+  if(TARGET ${TARGET_NAME}_static)
+    install(
+      TARGETS ${TARGET_NAME}_static
+      EXPORT ${TARGET_NAME}Targets
+      ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+      COMPONENT STATIC
+    )
+  endif()
+endfunction()
--- a/MyxCMake/lib/ColoredMessages.cmake
+++ b/MyxCMake/lib/ColoredMessages.cmake
@ -1,13 +1,13 @@
 #[=======================================================================[.rst:

 Обёртки для функции `message()`, которые в терминале UNIX
-подсвечиают сообщения в зависимости от важности.
+подсвечивают сообщения в зависимости от важности.

 #]=======================================================================]

 include_guard(GLOBAL)

-if(DEFINED ENV{TERM} AND UNIX)
+if(DEFINED ENV{COLORTERM} AND UNIX)
  string(ASCII 27 Esc)
  set(MyxColorReset       "${Esc}[m")
  set(MyxColorBold        "${Esc}[1m")
--- a/MyxCMake/lib/CompilerFlags.cmake
+++ b/MyxCMake/lib/CompilerFlags.cmake
@ -1,28 +0,0 @@
-include_guard(GLOBAL)
-
-if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-# cmake-format: off
-  if((MYX_CMAKE_LSB_DISTRIBUTOR_ID  STREQUAL "AstraLinuxSE") AND
-     (MYX_CMAKE_LSB_CODENAME        STREQUAL "smolensk") AND
-     (MYX_CMAKE_LSB_RELEASE_VERSION STREQUAL "1.5"))
-# cmake-format: on
-    set(CMAKE_CXX_STANDARD 11)
-    set(CMAKE_CXX_EXTENSIONS ON)
-    check_enable_cxx_compiler_flag(-Wno-shadow)
-  elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "e2k")
-    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()
-  if(CMAKE_COLOR_MAKEFILE)
-    check_enable_cxx_compiler_flag(-fdiagnostics-color=auto)
-  endif()
-endif()
-
-if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-  if(CMAKE_COLOR_MAKEFILE)
-    check_enable_cxx_compiler_flag(-fcolor-diagnostics)
-  endif()
-endif()
-
--- a/MyxCMake/lib/CreatePackages.cmake
+++ b/MyxCMake/lib/CreatePackages.cmake
@ -0,0 +1,194 @@
+function(myx_create_packages TARGET_NAME)
+  if(NOT ${PROJECT_BINARY_DIR} STREQUAL ${CMAKE_BINARY_DIR})
+    return()
+  endif()
+
+  set(options)
+  set(oneValueArgs DEBIAN_PACKAGE_TYPE CPACK_DEBIAN_PACKAGE_SECTION CPACK_DEBIAN_PACKAGE_PRIORITY
+                   CMAKE_INSTALL_DEFAULT_COMPONENT_NAME CPACK_PACKAGE_CONTACT CPACK_PACKAGING_INSTALL_PREFIX)
+  set(multiValueArgs CPACK_SOURCE_GENERATOR CPACK_GENERATOR CPACK_SOURCE_IGNORE_FILES)
+  cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+  # Общие настройки для пакета: организация, автор, версия
+  if(NOT ${PROJECT_NAME}_CONTACT)
+    if(${PROJECT_NAME}_AUTHOR_NAME AND ${PROJECT_NAME}_AUTHOR_EMAIL)
+      set(CPACK_PACKAGE_CONTACT "${${PROJECT_NAME}_AUTHOR_NAME} <${${PROJECT_NAME}_AUTHOR_EMAIL}>")
+    else()
+      set(CPACK_PACKAGE_CONTACT "unknown maintainer <nonexistent@mailbox>")
+      myx_message_warning("\${PROJECT_NAME}_CONTACT variable is required for packaging but unset")
+    endif()
+  else()
+    set(CPACK_PACKAGE_CONTACT ${${PROJECT_NAME}_CONTACT})
+  endif()
+
+  if(NOT ${PROJECT_NAME}_VENDOR)
+    if(${PROJECT_NAME}_AUTHOR_NAME)
+      set(CPACK_PACKAGE_VENDOR "${${PROJECT_NAME}_AUTHOR_NAME}")
+    else()
+      set(CPACK_PACKAGE_VENDOR "unknown vendor")
+      myx_message_warning("\${PROJECT_NAME}_VENDOR variable is required for packaging but unset")
+    endif()
+  else()
+    set(CPACK_PACKAGE_VENDOR ${${PROJECT_NAME}_VENDOR})
+  endif()
+
+  string(TOLOWER ${PROJECT_NAME} PN)
+  set(CPACK_PACKAGE_NAME ${PN})
+  set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
+
+  if(NOT CPACK_PACKAGING_INSTALL_PREFIX)
+    set(CPACK_PACKAGING_INSTALL_PREFIX "/usr")
+  endif()
+
+  # Параметры для архива исходных текстов
+  if(NOT ARG_CPACK_SOURCE_GENERATOR)
+    set(CPACK_SOURCE_GENERATOR "TXZ")
+  else()
+    set(ARG_CPACK_SOURCE_GENERATOR ${CPACK_SOURCE_GENERATOR})
+  endif()
+  set(CPACK_SOURCE_PACKAGE_FILE_NAME "${PN}-${CPACK_PACKAGE_VERSION}")
+
+  # Типы генераторов для бинарных архивов
+  if(NOT ARG_CPACK_GENERATOR)
+    set(CPACK_GENERATOR "TXZ" "DEB")
+  else()
+    set(CPACK_GENERATOR ${ARG_CPACK_GENERATOR})
+  endif()
+  if(CMAKE_SYSTEM_NAME STREQUAL Windows)
+    list(REMOVE_ITEM CPACK_GENERATOR "DEB")
+  endif()
+
+  # Параметры для архива собранного проекта
+  set(CPACK_TARGET_ARCH ${CMAKE_SYSTEM_PROCESSOR})
+  if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+    set(CPACK_TARGET_ARCH "amd64")
+  endif()
+  set(CPACK_PACKAGE_FILE_NAME "${PN}_${CPACK_PACKAGE_VERSION}")
+
+  # Список масок для исключения из архива исходных текстов
+  set(CPACK_SOURCE_IGNORE_FILES
+      ${ARG_CPACK_SOURCE_IGNORE_FILES}
+      ${CMAKE_BINARY_DIR}
+      "^${CMAKE_SOURCE_DIR}/.?build.?/"
+      "^${CMAKE_SOURCE_DIR}/.?output.?/"
+      "^${CMAKE_SOURCE_DIR}/files/var"
+      "^${CMAKE_SOURCE_DIR}/files/log"
+      "CMakeLists.txt.user.*"
+      ".*.autosave"
+      ".*.status"
+      "~$"
+      "\\\\.swp$")
+
+  option(MYX_COMPACT_SOURCE_PACKAGE "Make compact source package" ON)
+  if(MYX_COMPACT_SOURCE_PACKAGE)
+    # Список масок для исключения из архива исходных текстов для более компактного архива
+    set(CPACK_SOURCE_IGNORE_FILES
+        ${CPACK_SOURCE_IGNORE_FILES}
+        "\\\\.git"
+        "/\\\\.git/"
+        "/\\\\.gitlab-ci/"
+        "\\\\.clang-tidy$"
+        "\\\\.cmake-format$"
+        "\\\\.gitignore$"
+        "\\\\.gitattributes$"
+        "\\\\.gitmodules$"
+        "\\\\.gitlab-ci.yml$")
+  endif()
+
+  if("TXZ" IN_LIST CPACK_GENERATOR)
+    set(CPACK_ARCHIVE_COMPONENT_INSTALL OFF)
+    set(CPACK_ARCHIVE_FILE_NAME "${PN}_${CPACK_TARGET_ARCH}_${CPACK_PACKAGE_VERSION}")
+  endif()
+
+  if("DEB" IN_LIST CPACK_GENERATOR)
+    set(CPACK_DEB_MONOLITHIC_INSTALL OFF)
+    set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
+
+    # По умолчанию пакет собирается для дистрибутива unstable
+    if(NOT ARG_DEBIAN_PACKAGE_TYPE)
+      set(DEBIAN_PACKAGE_TYPE "unstable")
+    endif()
+
+    if(NOT ARG_CPACK_DEBIAN_PACKAGE_SECTION)
+      set(CPACK_DEBIAN_PACKAGE_SECTION "misc")
+    endif()
+
+    if(NOT ARG_CPACK_DEBIAN_PACKAGE_PRIORITY)
+      set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
+    endif()
+
+    # По умолчанию пакет для Debian делится на компоненты
+    if(NOT ARG_CPACK_DEB_COMPONENT_INSTALL)
+      set(CPACK_DEB_COMPONENT_INSTALL ON)
+    endif()
+
+    # Если имя компонента по умолчанию не определено, то устанавливается main
+    if(NOT CMAKE_INSTALL_DEFAULT_COMPONENT_NAME)
+      set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME MAIN)
+    endif()
+
+    # В списке компонентов обязательно должны быть main, lib, dev, static и doc
+    #list(APPEND CPACK_COMPONENTS_ALL main lib dev static doc)
+    # TODO
+    #list(REMOVE_DUPLICATES CPACK_COMPONENTS_ALL)
+
+    set(deb_arch_suffix "${CPACK_PACKAGE_VERSION}_${CPACK_TARGET_ARCH}.deb")
+    # Правило формирования имени пакета и файла для компонента main
+    set(CPACK_DEBIAN_MAIN_PACKAGE_NAME "${PN}")
+    set(CPACK_DEBIAN_MAIN_FILE_NAME ${CPACK_DEBIAN_MAIN_PACKAGE_NAME}_${deb_arch_suffix})
+
+    # Правило формирования имени пакета и файла для компонента lib
+    set(CPACK_DEBIAN_LIB_PACKAGE_NAME "lib${PN}${PROJECT_VERSION_MAJOR}")
+    set(CPACK_DEBIAN_LIB_FILE_NAME ${CPACK_DEBIAN_LIB_PACKAGE_NAME}_${deb_arch_suffix})
+
+    # Правило формирования имени пакета и файла для компонента dev
+    set(CPACK_DEBIAN_DEV_PACKAGE_NAME "lib${PN}-dev")
+    set(CPACK_DEBIAN_DEV_FILE_NAME ${CPACK_DEBIAN_DEV_PACKAGE_NAME}_${deb_arch_suffix})
+
+    # Правило формирования имени пакета и файла для компонента static
+    set(CPACK_DEBIAN_STATIC_PACKAGE_NAME "lib${PN}${PROJECT_VERSION_MAJOR}-static-dev")
+    set(CPACK_DEBIAN_STATIC_FILE_NAME ${CPACK_DEBIAN_STATIC_PACKAGE_NAME}_${deb_arch_suffix})
+    set(CPACK_DEBIAN_STATIC_PACKAGE_DEPENDS "lib${PN}-dev")
+
+    # Правило формирования имени пакета и файла для компонента doc
+    set(CPACK_DEBIAN_DOC_PACKAGE_NAME "${PN}-doc")
+    set(CPACK_DEBIAN_DOC_FILE_NAME ${PN}-doc_${CPACK_PACKAGE_VERSION}_all.deb)
+
+    foreach(iter ${CPACK_COMPONENTS_ALL})
+      string(TOLOWER ${iter} _cl)
+      string(TOUPPER ${iter} _cu)
+      # Правила формирования имени пакета и файла для остальных компонентов
+      if((NOT ${_cu} STREQUAL MAIN) AND
+         (NOT ${_cu} STREQUAL LIB) AND
+         (NOT ${_cu} STREQUAL DEV) AND
+         (NOT ${_cu} STREQUAL STATIC) AND
+         (NOT ${_cu} STREQUAL DOC))
+        set(CPACK_DEBIAN_${_cu}_PACKAGE_NAME "${PN}-${_cl}")
+        set(CPACK_DEBIAN_${_cu}_FILE_NAME "${CPACK_DEBIAN_${_cu}_PACKAGE_NAME}_${deb_arch_suffix}")
+      endif()
+
+      # Если в каталоге ${CMAKE_SOURCE_DIR}/cmake/deb/${_cl} находятся сценарии сопровождающего
+      # postinst, preinst, postrm и prerm, то они будут добавлены к пакету.
+      if(EXISTS "${CMAKE_SOURCE_DIR}/cmake/deb/${_cl}/preinst")
+        list(APPEND CPACK_DEBIAN_${_cu}_PACKAGE_CONTROL_EXTRA "${CMAKE_SOURCE_DIR}/cmake/deb/${_cl}/preinst")
+      endif()
+      if(EXISTS "${CMAKE_SOURCE_DIR}/cmake/deb/${_cl}/postinst")
+        list(APPEND CPACK_DEBIAN_${_cu}_PACKAGE_CONTROL_EXTRA "${CMAKE_SOURCE_DIR}/cmake/deb/${_cl}/postinst")
+      endif()
+      if(EXISTS "${CMAKE_SOURCE_DIR}/cmake/deb/${_cl}/prerm")
+        list(APPEND CPACK_DEBIAN_${_cu}_PACKAGE_CONTROL_EXTRA "${CMAKE_SOURCE_DIR}/cmake/deb/${_cl}/prerm")
+      endif()
+      if(EXISTS "${CMAKE_SOURCE_DIR}/cmake/deb/${_cl}/postrm")
+        list(APPEND CPACK_DEBIAN_${_cu}_PACKAGE_CONTROL_EXTRA "${CMAKE_SOURCE_DIR}/cmake/deb/${_cl}/postrm")
+      endif()
+    endforeach()
+
+    if(UNIX AND NOT TARGET deb)
+      add_custom_target(deb WORKING_DIRECTORY ${CMAKE_BINARY_DIR} COMMAND cpack -G DEB)
+      add_dependencies(deb ${TARGET_NAME})
+    endif()
+  endif()
+
+  # Подключение модуля, выполняющего сборку архивов и пакетов
+  include(CPack)
+endfunction(myx_create_packages TARGET_NAME)
--- a/MyxCMake/lib/DownloadContent.cmake
+++ b/MyxCMake/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/MyxCMake/lib/FetchContentAdd.cmake
+++ b/MyxCMake/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 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(
-    ${NAME}
-    ${ARG_UNPARSED_ARGUMENTS}
-    GIT_REPOSITORY ${ARG_GIT_REPOSITORY}
-    GIT_SHALLOW 1
-    )
-
-  set(FETCHCONTENT_QUIET off)
-  FetchContent_MakeAvailable(${NAME})
-endfunction()
--- a/MyxCMake/lib/LSBInfo.cmake
+++ b/MyxCMake/lib/LSBInfo.cmake
@ -1,34 +0,0 @@
-include_guard(GLOBAL)
-
-if(CMAKE_SYSTEM_NAME STREQUAL Linux)
-  set(MYX_CMAKE_LSB_DISTRIBUTOR_ID "unknown")
-  set(MYX_CMAKE_LSB_CODENAME "unknown")
-  set(MYX_CMAKE_LSB_RELEASE_VERSION "unknown")
-
-  if(CMAKE_CROSSCOMPILING)
-    return()
-  endif()
-
-  if(EXISTS /etc/mcst_version)
-    set(MYX_CMAKE_LSB_DISTRIBUTOR_ID "ElbrusD")
-    set(MYX_CMAKE_LSB_CODENAME "Jessie")
-    execute_process(COMMAND cat /etc/mcst_version
-      OUTPUT_VARIABLE MYX_CMAKE_LSB_RELEASE_VERSION
-      OUTPUT_STRIP_TRAILING_WHITESPACE)
-  else()
-    find_program(LSB_RELEASE_EXECUTABLE lsb_release)
-    # cmake-format: off
-    if(LSB_RELEASE_EXECUTABLE)
-      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_VERSION
-        OUTPUT_STRIP_TRAILING_WHITESPACE)
-    endif()
-    # cmake-format: on
-  endif()
-endif()
--- a/MyxCMake/lib/NinjaGeneratorWarning.cmake
+++ b/MyxCMake/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)
-  myx_message_error("Myx: Old CMake versions should use Makefile generator")
+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/MyxCMake/lib/ProjectIsTopLevel.cmake
+++ b/MyxCMake/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/MyxCMake/lib/Qt5TargetSetup.cmake
+++ b/MyxCMake/lib/Qt5TargetSetup.cmake
@ -1,100 +0,0 @@
-include_guard(GLOBAL)
-
-function(myx_qt5_target_setup 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 ${NAME} TYPE)
-
-  foreach(iter ${ARG_COMPONENTS})
-    if(target_type STREQUAL "INTERFACE_LIBRARY")
-      target_include_directories(${NAME} INTERFACE ${Qt5${iter}_INCLUDE_DIRS})
-    else()
-      target_include_directories(${NAME} PRIVATE ${Qt5${iter}_INCLUDE_DIRS})
-    endif()
-    if(target_type STREQUAL "EXECUTABLE" AND NOT iter STREQUAL "LinguistTools")
-      target_link_libraries(${NAME} PRIVATE "Qt5::${iter}")
-     endif()
-  endforeach()
-
-  foreach(iter ${ARG_PRIVATE})
-    if(target_type STREQUAL "INTERFACE_LIBRARY")
-      target_include_directories(${NAME} INTERFACE ${Qt5${iter}_PRIVATE_INCLUDE_DIRS})
-    else()
-      target_include_directories(${NAME} PRIVATE ${Qt5${iter}_PRIVATE_INCLUDE_DIRS})
-    endif()
-  endforeach()
-
-  if(target_type STREQUAL "EXECUTABLE")
-    target_compile_options(${NAME} PRIVATE ${Qt5Core_EXECUTABLE_COMPILE_FLAGS})
-  endif()
-
-  if(ARG_PUBLIC_MOC)
-    set_property(TARGET ${NAME} APPEND PROPERTY PUBLIC_HEADER_FILES "${ARG_PUBLIC_MOC}")
-    set_property(TARGET ${NAME} APPEND PROPERTY TR_FILES ${ARG_PUBLIC_MOC})
-  endif()
-
-  if(ARG_PRIVATE_MOC)
-    set_property(TARGET ${NAME} APPEND PROPERTY PRIVATE_HEADER_FILES "${ARG_PRIVATE_MOC}")
-    set_property(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 ${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 ${NAME} INTERFACE_TR_FILES)
-  else()
-    get_target_property(tr ${NAME} TR_FILES)
-  endif()
-  # Формирование файла ресурсов с переводами
-  if("LinguistTools" IN_LIST ARG_COMPONENTS AND tr)
-    # Заглавие файла ресурсов
-    file(WRITE ${PROJECT_BINARY_DIR}/${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/${NAME}_${iter}.ts"
-        OPTIONS -I ${PROJECT_SOURCE_DIR}/include -I ${PROJECT_SOURCE_DIR}/include/${PROJECT_NAME})
-      # Добавление записи для скомпилированного файла переводов в ресурсный файл
-      file(APPEND ${PROJECT_BINARY_DIR}/${NAME}_l10n.qrc
-        "<file alias=\"${NAME}_${iter}\">${NAME}_${iter}.qm</file>\n")
-      # Добавление скомпилированного файла переводов к списку зависимостей для цели
-      target_sources(${NAME} PRIVATE ${qm})
-    endforeach()
-    # Окончение файла ресурсов
-    file(APPEND ${PROJECT_BINARY_DIR}/${NAME}_l10n.qrc "</qresource></RCC>\n")
-    # Комплияция файла ресурсов с переводами
-    qt5_add_resources(qrc_l10n ${PROJECT_BINARY_DIR}/${NAME}_l10n.qrc)
-    target_sources(${NAME} PRIVATE ${qrc_l10n})
-  endif()
-  unset(tr)
-  target_sources(${NAME} PRIVATE ${ARG_PUBLIC_MOC} ${ARG_PRIVATE_MOC} ${moc_cpp} ${ui_h} ${qrc_cpp})
-
-  # Установка публичных заголовочных файлов
-  if(PROJECT_IS_TOP_LEVEL)
-    myx_install_relative(${PROJECT_SOURCE_DIR}
-      FILES ${ARG_PUBLIC_MOC}
-      DESTINATION ${CMAKE_INSTALL_PREFIX}
-      COMPONENT dev
-     )
-  endif()
-endfunction()
--- a/MyxCMake/lib/TargetSetup.cmake
+++ b/MyxCMake/lib/TargetSetup.cmake
@ -1,56 +1,57 @@
 include_guard(GLOBAL)

-function(myx_target_setup NAME)
+function(myx_target_setup TARGET_NAME)
  set(options)
  set(oneValueArgs PCH)
-  set(multiValueArgs COMPILE_DEFINITIONS PACKAGES LINK_LIBRARIES
-                     CPP INTERFACE_HEADERS PUBLIC_HEADERS PRIVATE_HEADERS)
+  set(multiValueArgs PACKAGES
+                     COMPILE_DEFINITIONS INCLUDE_DIRECTORIES LINK_LIBRARIES
+                     CPP PUBLIC_HEADERS PRIVATE_HEADERS)
  cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})

-  if(NOT TARGET ${NAME})
-    myx_message_fatal_error("Target ${NAME} does not exists.")
+  if(NOT TARGET ${TARGET_NAME})
+    myx_message_fatal_error("Target ${TARGET_NAME} does not exists.")
  endif()

-  get_target_property(target_type ${NAME} TYPE)
+  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()

  foreach(iter ${ARG_PACKAGES})
-    target_include_directories(${NAME} PRIVATE ${${iter}_INCLUDE_DIRS})
-    target_compile_definitions(${NAME} PRIVATE ${${iter}_COMPILE_DEFINITIONS})
+    target_include_directories(${TARGET_NAME} PRIVATE ${${iter}_INCLUDE_DIRS})
+    target_compile_definitions(${TARGET_NAME} PRIVATE ${${iter}_COMPILE_DEFINITIONS})
  endforeach()
-  target_compile_definitions(${NAME} PRIVATE ${ARG_COMPILE_DEFINITIONS})

  if(ARG_CPP)
-    set_property(TARGET ${NAME} APPEND PROPERTY CPP_FILES ${ARG_CPP})
-    set_property(TARGET ${NAME} APPEND PROPERTY TR_FILES ${ARG_CPP})
+    set_property(TARGET ${TARGET_NAME} APPEND PROPERTY CPP_FILES ${ARG_CPP})
+    set_property(TARGET ${TARGET_NAME} APPEND PROPERTY TR_FILES ${ARG_CPP})
  endif()

  if(ARG_PUBLIC_HEADERS)
-    set_property(TARGET ${NAME} APPEND PROPERTY PUBLIC_HEADER_FILES "${ARG_PUBLIC_HEADERS}")
-    set_property(TARGET ${NAME} APPEND PROPERTY TR_FILES ${ARG_PUBLIC_HEADERS})
+    set_property(TARGET ${TARGET_NAME} APPEND PROPERTY PUBLIC_HEADER_FILES "${ARG_PUBLIC_HEADERS}")
+    set_property(TARGET ${TARGET_NAME} APPEND PROPERTY TR_FILES ${ARG_PUBLIC_HEADERS})
  endif()

  if(ARG_PRIVATE_HEADERS)
-    set_property(TARGET ${NAME} APPEND PROPERTY PRIVATE_HEADER_FILES "${ARG_PRIVATE_HEADERS}")
-    set_property(TARGET ${NAME} APPEND PROPERTY TR_FILES ${ARG_PRIVATE_HEADERS})
+    set_property(TARGET ${TARGET_NAME} APPEND PROPERTY PRIVATE_HEADER_FILES "${ARG_PRIVATE_HEADERS}")
+    set_property(TARGET ${TARGET_NAME} APPEND PROPERTY TR_FILES ${ARG_PRIVATE_HEADERS})
  endif()

  if(ARG_PCH)
    if((${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.16) AND (PROJECT_IS_TOP_LEVEL OR MYX_USE_LOCAL_DIRECTORIES))
-      target_precompile_headers(${NAME} PRIVATE ${ARG_PCH})
+      target_precompile_headers(${TARGET_NAME} PRIVATE ${ARG_PCH})
    else()
-      target_compile_options(${NAME} PRIVATE -include ${ARG_PCH})
+      target_compile_options(${TARGET_NAME} PRIVATE -include ${ARG_PCH})
    endif()
-    set_property(TARGET ${NAME} APPEND PROPERTY PRIVATE_HEADER_FILES "${ARG_PCH}")
+    set_property(TARGET ${TARGET_NAME} APPEND PROPERTY PRIVATE_HEADER_FILES "${ARG_PCH}")
  endif()

-  if(NOT target_type STREQUAL "INTERFACE_LIBRARY")
-    target_include_directories(${PROJECT_NAME} PRIVATE
-      $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>)
+  target_include_directories(${PROJECT_NAME} PRIVATE
+    $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>)

-    if(IS_DIRECTORY "${PROJECT_SOURCE_DIR}/src")
-      target_include_directories(${PROJECT_NAME} PRIVATE
-        $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>)
-    endif()
+  if(IS_DIRECTORY "${PROJECT_SOURCE_DIR}/src")
+    target_include_directories(${PROJECT_NAME} PRIVATE
+      $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>)
  endif()

  if(target_type STREQUAL "EXECUTABLE")
@ -63,67 +64,71 @@ function(myx_target_setup NAME)
        $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/${PROJECT_NAME}>)
    endif()

-    set_target_properties(${NAME} PROPERTIES
+    set_target_properties(${TARGET_NAME} PROPERTIES
      POSITION_INDEPENDENT_CODE ON
      RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}
    )
+
    if(CMAKE_CXX_COMPILE_OPTIONS_PIE)
-      target_compile_options(${NAME} PUBLIC ${CMAKE_CXX_COMPILE_OPTIONS_PIE})
+      target_compile_options(${TARGET_NAME} PUBLIC ${CMAKE_CXX_COMPILE_OPTIONS_PIE})
    endif()
-    install(TARGETS ${NAME} COMPONENT main RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+    install(TARGETS ${TARGET_NAME} COMPONENT MAIN RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
  endif()

-  if(${target_type} STREQUAL "INTERFACE_LIBRARY")
-    target_sources(${NAME} INTERFACE $<BUILD_INTERFACE:${ARG_INTERFACE_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(${NAME} PUBLIC $<BUILD_INTERFACE:${ARG_INTERFACE_HEADERS}>)
-    target_sources(${NAME} PUBLIC ${ARG_PUBLIC_HEADERS})
-    target_sources(${NAME} PRIVATE ${ARG_CPP} ${ARG_PCH} ${ARG_PRIVATE_HEADERS})
-    target_compile_definitions(${NAME} PRIVATE ${ARG_COMPILE_DEFINITIONS})
+    target_sources(${TARGET_NAME} PRIVATE ${ARG_PUBLIC_HEADERS})
+    target_sources(${TARGET_NAME} PRIVATE ${ARG_CPP} ${ARG_PCH} ${ARG_PRIVATE_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(${NAME} PRIVATE ${ARG_LINK_LIBRARIES})
+    target_link_libraries(${TARGET_NAME} PRIVATE ${ARG_LINK_LIBRARIES})
  else()
    if((NOT ${target_type} STREQUAL "OBJECT_LIBRARY") AND
       (NOT ${target_type} STREQUAL "EXECUTABLE"))
-      target_link_libraries(${NAME} PRIVATE ${ARG_LINK_LIBRARIES})
-    elseif(${target_type} STREQUAL "INTERFACE")
-      target_link_libraries(${NAME} INTERFACE ${ARG_LINK_LIBRARIES})
+      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_dir ${link_library} INTERFACE_INCLUDE_DIRECTORIES)
-            if(include_dir)
-              target_include_directories(${NAME} PUBLIC ${include_dir})
+          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(${library_type} STREQUAL "OBJECT_LIBRARY")
                if(TARGET ${link_library}_static)
-                  target_link_libraries(${NAME} PRIVATE ${link_library}_static)
+                  target_link_libraries(${TARGET_NAME} PRIVATE ${link_library}_static)
                else()
-                  target_link_libraries(${NAME} PRIVATE ${link_library}_shared)
+                  target_link_libraries(${TARGET_NAME} PRIVATE ${link_library}_shared)
                endif()
              else()
-                target_link_libraries(${NAME} PRIVATE ${link_library})
+                target_link_libraries(${TARGET_NAME} PRIVATE ${link_library})
              endif()
            endif()
          endif()
+        else()
+          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()
  endif()

  # Установка публичных заголовочных файлов
-  if(PROJECT_IS_TOP_LEVEL)
+  if(PROJECT_IS_TOP_LEVEL AND ARG_PUBLIC_HEADERS)
    myx_install_relative(${PROJECT_SOURCE_DIR}
-      FILES ${ARG_PUBLIC_HEADERS} ${ARG_INTERFACE_HEADERS}
+      FILES ${ARG_PUBLIC_HEADERS}
      DESTINATION ${CMAKE_INSTALL_PREFIX}
-      COMPONENT dev
+      COMPONENT DEV
    )
  endif()
 endfunction()
--- a/MyxCMake/lib/TargetSetupQt.cmake
+++ b/MyxCMake/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/MyxCMake/lib/Toolchain.cmake
+++ b/MyxCMake/lib/Toolchain.cmake
@ -1,35 +0,0 @@
-include_guard(GLOBAL)
-
-# Предпочтительные пути к утилитам для компоновки
-if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-# cmake-format: off
-  # Astra Linux Smolensk 1.5
-  if((MYX_CMAKE_LSB_DISTRIBUTOR_ID  STREQUAL "AstraLinuxSE") AND
-     (MYX_CMAKE_LSB_CODENAME        STREQUAL "smolensk") AND
-     (MYX_CMAKE_LSB_RELEASE_VERSION 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 NAMES "/usr/bin/x86_64-linux-gnu-gcc-ranlib-4.7")
-  # Elbrus E2K
-  elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "e2k")
-    find_program(CMAKE_GCC_AR NAMES "/usr/${CMAKE_SYSTEM_PROCESSOR}-linux/bin/ar")
-    find_program(CMAKE_GCC_NM NAMES "/usr/${CMAKE_SYSTEM_PROCESSOR}-linux/bin/nm")
-    find_program(CMAKE_GCC_RANLIB NAMES "/usr/${CMAKE_SYSTEM_PROCESSOR}-linux/bin/ranlib")
-  # Другие версии Linux
-  else()
-    find_program(CMAKE_GCC_AR NAMES "gcc-ar" "ar")
-    find_program(CMAKE_GCC_NM NAMES "gcc-nm" "nm")
-    find_program(CMAKE_GCC_RANLIB NAMES "gcc-ranlib" "ranlib")
-  endif()
-# cmake-format: on
-
-  if(CMAKE_GCC_AR)
-    set(CMAKE_AR ${CMAKE_GCC_AR} CACHE STRING "" FORCE)
-  endif()
-  if(CMAKE_GCC_NM)
-    set(CMAKE_NM ${CMAKE_GCC_NM} CACHE STRING "" FORCE)
-  endif()
-  if(CMAKE_GCC_RANLIB)
-    set(CMAKE_RANLIB ${CMAKE_GCC_RANLIB} CACHE STRING "" FORCE)
-  endif()
-endif()
--- a/MyxCMake/lib/Toolchains.cmake
+++ b/MyxCMake/lib/Toolchains.cmake
@ -0,0 +1,71 @@
+include_guard(GLOBAL)
+
+if(CMAKE_SYSTEM_NAME STREQUAL Linux)
+  set(MYX_CMAKE_LSB_DISTRIBUTOR_ID "unknown")
+  set(MYX_CMAKE_LSB_CODENAME "unknown")
+  set(MYX_CMAKE_LSB_RELEASE_VERSION "unknown")
+
+  if(CMAKE_CROSSCOMPILING)
+    return()
+  endif()
+
+  if(EXISTS /etc/mcst_version)
+    set(MYX_CMAKE_LSB_DISTRIBUTOR_ID "ElbrusD")
+    set(MYX_CMAKE_LSB_CODENAME "Jessie")
+    execute_process(COMMAND cat /etc/mcst_version
+      OUTPUT_VARIABLE MYX_CMAKE_LSB_RELEASE_VERSION
+      OUTPUT_STRIP_TRAILING_WHITESPACE)
+  else()
+    find_program(LSB_RELEASE_EXECUTABLE lsb_release)
+    # cmake-format: off
+    if(LSB_RELEASE_EXECUTABLE)
+      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_VERSION
+        OUTPUT_STRIP_TRAILING_WHITESPACE)
+    endif()
+    # cmake-format: on
+  endif()
+endif()
+
+if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+  if(CMAKE_COLOR_MAKEFILE)
+    check_enable_cxx_compiler_flag(-fdiagnostics-color=auto)
+  endif()
+endif()
+
+if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+  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"))
+  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"))
+  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/MyxCMake/lib/Uninstall.cmake
+++ b/MyxCMake/lib/Uninstall.cmake
@ -6,7 +6,7 @@

 include_guard(GLOBAL)

-if(NOT TARGET uninstall)
+if((NOT TARGET uninstall) AND (NOT DEFINED ENV{SAPR_PREFIX}))
  configure_file(${CMAKE_CURRENT_LIST_DIR}/uninstall.cmake.in
                 ${CMAKE_BINARY_DIR}/cmake_uninstall.cmake IMMEDIATE @ONLY)
  add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P ${CMAKE_BINARY_DIR}/cmake_uninstall.cmake)
--- a/MyxCMake/lib/doc/Doxygen.cmake
+++ b/MyxCMake/lib/doc/Doxygen.cmake
@ -1,15 +1,18 @@
-include_guard(GLOBAL)
-
-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()

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

-  find_package(Doxygen)
+  if(NOT ${PROJECT_BINARY_DIR} STREQUAL ${CMAKE_BINARY_DIR})
+    return()
+  endif()
+
  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")
@ -17,14 +20,14 @@ function(myx_doc_doxygen NAME)
    set(DOXYGEN_FOUND OFF CACHE STRING "Doxygen documentation generator disabled" FORCE)
  endif()

-  set(target "myx-doc-doxygen-${NAME}")
-  if(NOT DOXYGEN_FOUND)
-    add_custom_target(${target} VERBATIM COMMENT "Doxygen is not found. Skipping target ${target} build")
+  set(target myx-doc-doxygen-${TARGET_NAME})
+  if(TARGET ${target})
+    myx_message_warning("Target ${target} already defined")
    return()
  endif()

-  if(TARGET ${target})
-    myx_message_warning("Target ${target} already defined")
+  if(NOT DOXYGEN_FOUND)
+    add_custom_target(${target} VERBATIM COMMENT "Doxygen is not found. Skipping target ${target} build")
    return()
  endif()

@ -63,7 +66,7 @@ function(myx_doc_doxygen NAME)
    COMMENT "Generating API documentation with Doxygen")
  if(ARG_HTML)
    install(DIRECTORY ${CMAKE_BINARY_DIR}/doc/doxygen/html/
-            COMPONENT doc OPTIONAL
+            COMPONENT DOC OPTIONAL
            DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/doxygen)
  endif()
  if(NOT TARGET myx-doc-doxygen)
--- a/MyxCMake/lib/generators/GitInfo.cmake
+++ b/MyxCMake/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/MyxCMake/lib/generators/GitInfoHeader.cmake
+++ b/MyxCMake/lib/generators/GitInfoHeader.cmake
@ -5,23 +5,24 @@ myx_generate_git_info_header
 Вспомогательная функция для автоматической генерации заголовочного
 файла, содержащего информацию о текущем состоянии репозитория git::

-    myx_generate_git_info_header(TARGET BASE_FILENAME
+    myx_generate_git_info_header(TARGET_NAME BASE_FILENAME
      [ PREFIX prefix ] )

-Обязательные параметры: `TARGET` - имя цели, с которой связан заголовочный файл,
-и `BASE_FILENAME` - имя генерируемого заголовочного файла. Дополнительный аргумент
-`PREFIX` добавляет префикс к генерируемым именам переменных.
+    Обязательные параметры: `TARGET_NAME` - имя цели, с которой связан
+заголовочный файл, и `BASE_FILENAME` - имя генерируемого заголовочного
+файла. Дополнительный аргумент `PREFIX` добавляет префикс к генерируемым
+именам переменных.

 #]=======================================================================]

 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 base_filename)
-  if(${CMAKE_VERSION} VERSION_LESS "3.17.0")
+function(myx_generate_git_info_header TARGET_NAME BASE_FILENAME)
+  if(${CMAKE_VERSION} VERSION_LESS 3.17.0)
    set(CMAKE_CURRENT_FUNCTION_LIST_DIR ${MYX_CMAKE_LIB_GENERATORS_DIR_BACKPORT})
  endif()

@ -30,24 +31,31 @@ function(myx_generate_git_info_header target base_filename)
  set(multiValueArgs)
  cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})

-  set(filename "${PROJECT_BINARY_DIR}/include/${base_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}-git-info-header)
-    add_custom_target(${target}-git-info-header ALL
-      ${CMAKE_COMMAND} -DGIT_INFO_FILE=${filename} -DPREFIX=${PREFIX}
+  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}
                       -P ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/GitInfo.cmake
      BYPRODUCTS ${filename}
      WORKING_DIRECTORY ${CMAKE_CURRENT_FUNCTION_LIST_DIR})
  endif()
 # cmake-format: on

-  set_property(TARGET ${target} APPEND PROPERTY PRIVATE_HEADER_FILES ${filename})
-  target_sources(${target} PRIVATE ${filename})
+  get_target_property(target_type ${TARGET_NAME} TYPE)
+  if(${target_type} STREQUAL "INTERFACE_LIBRARY")
+    target_sources(${TARGET_NAME} INTERFACE $<BUILD_INTERFACE:${filename}>)
+  else()
+    set_property(TARGET ${TARGET_NAME} APPEND PROPERTY PRIVATE_HEADER_FILES ${filename})
+    target_sources(${TARGET_NAME} PRIVATE ${filename})
+  endif()
+  add_dependencies(${TARGET_NAME} ${TARGET_NAME}-git-info-header)
 endfunction()
--- a/MyxCMake/lib/generators/PrivateConfigHeader.cmake
+++ b/MyxCMake/lib/generators/PrivateConfigHeader.cmake
@ -5,21 +5,21 @@ myx_generate_private_config_header
 Вспомогательная функция для автоматической генерации заголовочного
 файла, содержащего информацию о проекте::

-    myx_generate_private_config_header(TARGET BASE_FILENAME)
+    myx_generate_private_config_header(TARGET_NAME BASE_FILENAME)

-Обязательные параметры: `TARGET` - имя цели, с которой связан заголовочный файл,
-и `BASE_FILENAME` - имя генерируемого заголовочного файла.
+    Обязательные параметры: `TARGET_NAME` - имя цели, с которой связан
+заголовочный файл, и `BASE_FILENAME` - имя генерируемого заголовочного файла.

 #]=======================================================================]

 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 base_filename)
-  if(${CMAKE_VERSION} VERSION_LESS "3.17.0")
+function(myx_generate_private_config_header TARGET_NAME BASE_FILENAME)
+  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 base_filename)
  myx_project_version_int()
  get_property(PROJECT_VERSION_INT GLOBAL PROPERTY PROJECT_VERSION_INT)

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

-  set_property(TARGET ${target} APPEND PROPERTY PRIVATE_HEADER_FILES ${filename})
-  target_sources(${target} PRIVATE ${filename})
+  get_target_property(target_type ${TARGET_NAME} TYPE)
+  if(${target_type} STREQUAL "INTERFACE_LIBRARY")
+    target_sources(${TARGET_NAME} INTERFACE $<BUILD_INTERFACE:${filename}>)
+  else()
+    set_property(TARGET ${TARGET_NAME} APPEND PROPERTY PRIVATE_HEADER_FILES ${filename})
+    target_sources(${TARGET_NAME} PRIVATE ${filename})
+  endif()
 endfunction()
--- a/MyxCMake/lib/macro/CheckEnableCxxCompilerFlag.cmake
+++ b/MyxCMake/lib/macro/CheckEnableCxxCompilerFlag.cmake
@ -1,28 +1,29 @@
 include_guard(GLOBAL)

-# based on https://github.com/bluescarni/yacma
-
+# Добавление флага к списку используемых после проверки
+# возможности его использования текущим компилятором
+# Основано на https://github.com/bluescarni/yacma
 include(CheckCXXCompilerFlag)

-macro(check_enable_cxx_compiler_flag flag)
+macro(check_enable_cxx_compiler_flag FLAG)
  set(options)
  set(oneValueArgs TARGET)
  set(multiValueArgs)
  cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})

  set(CMAKE_REQUIRED_QUIET TRUE)
-  check_cxx_compiler_flag("${flag}" check_cxx_flag)
+  check_cxx_compiler_flag("${FLAG}" check_cxx_flag)
  unset(CMAKE_REQUIRED_QUIET)

  if(check_cxx_flag)
-    myx_message_notice("'${flag}': flag is supported.")
+    myx_message_notice("'${FLAG}': flag is supported.")
    if(ARG_TARGET)
-      target_compile_options(${ARG_TARGET} PUBLIC ${flag})
+      target_compile_options(${ARG_TARGET} PUBLIC ${FLAG})
    else()
-      add_compile_options(${flag})
+      add_compile_options(${FLAG})
    endif()
  else()
-    myx_message_status("'${flag}': flag is NOT supported.")
+    myx_message_status("'${FLAG}': flag is NOT supported.")
  endif()

  unset(check_cxx_flag CACHE)
--- a/MyxCMake/lib/macro/CreateSymlink.cmake
+++ b/MyxCMake/lib/macro/CreateSymlink.cmake
@ -1,11 +1,13 @@
 include_guard(GLOBAL)

-macro(myx_create_symlink original linkname)
-  if(NOT EXISTS ${linkname})
-    if(${CMAKE_VERSION} VERSION_LESS "3.14.0")
-      execute_process(COMMAND ${CMAKE_COMMAND} -E myx_create_symlink ${original} ${linkname})
+# Создание символических ссылок
+macro(myx_create_symlink ORIGINAL_FILENAME LINKNAME)
+  if(UNIX AND (NOT EXISTS ${LINKNAME}))
+    if(${CMAKE_VERSION} VERSION_LESS 3.14.0)
+      execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
+                              ${ORIGINAL_FILENAME} ${LINKNAME})
    else()
-      file(CREATE_LINK ${original} ${linkname} SYMBOLIC)
+      file(CREATE_LINK ${ORIGINAL_FILENAME} ${LINKNAME} SYMBOLIC)
    endif()
  endif()
-endmacro(myx_create_symlink original linkname)
+endmacro(myx_create_symlink ORIGINAL_FILENAME LINKNAME)
--- a/MyxCMake/lib/macro/FindPackages.cmake
+++ b/MyxCMake/lib/macro/FindPackages.cmake
@ -1,26 +1,54 @@
+#[=======================================================================[.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_requred_packages)
+macro(myx_find_packages)
  set(options)
  set(oneValueArgs)
-  set(multiValueArgs PACKAGES Boost Qt5 Qt5Private)
+  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)
+  foreach(iter ${ARG_OPTIONAL})
+    find_package(${iter})
+  endforeach()
+
+  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_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_OPTIONAL)
+    find_package(PkgConfig REQUIRED)
+    foreach(iter ${ARG_PKG_OPTIONAL})
+      string(TOUPPER ${iter} iu)
+      pkg_check_modules(${iu} ${iter})
    endforeach()
  endif()

--- a/MyxCMake/lib/macro/FindQt.cmake
+++ b/MyxCMake/lib/macro/FindQt.cmake
@ -0,0 +1,47 @@
+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()
+
+  if(ARG_REQUIRED AND ARG_PRIVATE)
+    message("-- MyxCMake: searching required Qt private components: ${ARG_PRIVATE}")
+  endif()
+  foreach(iter ${ARG_PRIVATE})
+    find_package("Qt${ARG_VERSION}${iter}" COMPONENTS Private ${ARG_REQUIRED})
+  endforeach()
+
+  if(ARG_REQUIRED AND ARG_COMPONENTS)
+    message("-- MyxCMake: searching required Qt components: ${ARG_COMPONENTS}")
+  endif()
+  foreach(iter ${ARG_COMPONENTS})
+    find_package(Qt${ARG_VERSION} COMPONENTS ${iter} ${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/MyxCMake/lib/macro/GTest.cmake
+++ b/MyxCMake/lib/macro/GTest.cmake
@ -0,0 +1,30 @@
+include_guard(GLOBAL)
+
+macro(myx_add_gtest TARGET_NAME)
+  set(options)
+  set(oneValueArgs)
+  set(multiValueArgs)
+  cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+  add_executable(${TARGET_NAME} ${ARG_UNPARSED_ARGUMENTS})
+
+  find_package(GTest)
+  if(GTest_FOUND)
+    target_link_libraries(${TARGET_NAME} PRIVATE GTest::GTest GTest::Main)
+  else()
+    if((NOT TARGET gtest) AND (NOT TARGET gtest_main))
+      add_subdirectory(/usr/src/googletest/googletest ${CMAKE_BINARY_DIR}/gtest)
+    endif()
+    target_link_libraries(${TARGET_NAME} PRIVATE gtest gtest_main)
+  endif()
+
+  add_test(NAME ${TARGET_NAME} COMMAND ${TARGET_NAME})
+  foreach(iter IN LISTS oneValueArgs multiValueArgs)
+    unset(ARG_${iter})
+  endforeach()
+  unset(ARG_UNPARSED_ARGUMENTS)
+  unset(multiValueArgs)
+  unset(oneValueArgs)
+  unset(options)
+endmacro()
+
--- a/MyxCMake/lib/macro/QTest.cmake
+++ b/MyxCMake/lib/macro/QTest.cmake
@ -0,0 +1,40 @@
+include_guard(GLOBAL)
+
+macro(myx_add_qtest TARGET_NAME)
+  set(options)
+  set(oneValueArgs)
+  set(multiValueArgs)
+  cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+  find_package(Qt5 COMPONENTS Core Test REQUIRED)
+  if(NOT Qt5Test_FOUND)
+    myx_message_fatal_error("Qt testing framework is not found")
+    return()
+  endif()
+
+  foreach(filename ${ARG_UNPARSED_ARGUMENTS})
+    get_filename_component(basename ${filename} NAME_WE)
+    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} PRIVATE Qt5::Core Qt5::Test)
+
+  add_test(NAME ${TARGET_NAME} COMMAND ${TARGET_NAME})
+
+  unset(cpps)
+  unset(hpps)
+  unset(moc)
+  unset(mocs)
+  foreach(iter IN LISTS oneValueArgs multiValueArgs)
+    unset(ARG_${iter})
+  endforeach()
+  unset(ARG_UNPARSED_ARGUMENTS)
+  unset(multiValueArgs)
+  unset(oneValueArgs)
+  unset(options)
+endmacro()
+
--- a/MyxCMake/lib/macro/SkipExternalTarget.cmake
+++ b/MyxCMake/lib/macro/SkipExternalTarget.cmake
@ -1,33 +0,0 @@
-include_guard(GLOBAL)
-
-# Пропуск целей, которые создаются автоматически в `CMAKE_BINARY_DIR`
-macro(myx_skip_external_target NAME)
-  get_target_property(__type ${NAME} TYPE)
-  if(__type STREQUAL "INTERFACE_LIBRARY")
-    get_target_property(__sources ${NAME} INTERFACE_SOURCES)
-    foreach(iter ${__sources})
-      string(FIND ${iter} ${CMAKE_BINARY_DIR} __pos)
-      if(__pos GREATER -1)
-        unset(__type)
-        unset(__pos)
-        unset(__sources)
-        return()
-      endif()
-    endforeach()
-    unset(__type)
-    unset(__pos)
-    unset(__sources)
-  else()
-    get_target_property(__source_dir ${NAME} SOURCE_DIR)
-    string(FIND ${__source_dir} ${CMAKE_BINARY_DIR} __pos)
-    if(__pos EQUAL 0)
-      unset(__type)
-      unset(__pos)
-      unset(__source_dir)
-      return()
-    endif()
-    unset(__pos)
-    unset(__source_dir)
-  endif()
-  unset(__type)
-endmacro(myx_skip_external_target NAME)
--- a/MyxCMake/lib/uncrustify/Uncrustify.cmake
+++ b/MyxCMake/lib/uncrustify/Uncrustify.cmake
@ -1,13 +1,11 @@
-include_guard(GLOBAL)
-
-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 NAME)
-  if(${CMAKE_VERSION} VERSION_LESS "3.17.0")
+function(myx_uncrustify TARGET_NAME)
+  if(${CMAKE_VERSION} VERSION_LESS 3.17.0)
    set(CMAKE_CURRENT_FUNCTION_LIST_DIR ${MYX_CMAKE_LIB_UNCRUSTIFY_DIR_BACKPORT})
  endif()

@ -16,22 +14,23 @@ function(myx_uncrustify NAME)
  set(multiValueArgs)
  cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})

-  myx_skip_external_target(${NAME})
-
  if(NOT ARG_CONFIG)
-    set(ARG_CONFIG "${PROJECT_SOURCE_DIR}/.uncrustify.cfg")
-    if(NOT EXISTS ${ARG_CONFIG})
-      set(ARG_CONFIG "${CMAKE_SOURCE_DIR}/.uncrustify.cfg")
-    endif()
+    set(ARG_CONFIG "${PROJECT_SOURCE_DIR}/uncrustify.cfg")
  endif()

  if(NOT EXISTS ${ARG_CONFIG})
-    myx_message_notice("MyxCMake: uncrustify config is not found")
+    myx_message_notice("-- MyxCMake: uncrustify config is not found")
    return()
  endif()

  if(NOT UNCRUSTIFY_EXE)
-    myx_message_notice("MyxCMake: uncrustify executable is not found")
+    myx_message_notice("-- MyxCMake: uncrustify executable is not found")
+    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()

@ -46,44 +45,53 @@ function(myx_uncrustify NAME)
  endif()

  # Динамически сгенерированные файлы исключаются
-  get_target_property(target_type ${NAME} TYPE)
-  if(${target_type} STREQUAL "INTERFACE_LIBRARY")
-    get_target_property(s ${NAME} INTERFACE_SOURCES)
+  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(s ${NAME} SOURCES)
+    get_target_property(target_sources ${TARGET_NAME} SOURCES)
+    if(target_sources)
+      list(APPEND all_sources ${target_sources})
+    endif()
  endif()
-  foreach(iter ${s})
+
+  foreach(iter ${all_sources})
    string(FIND ${iter} ${CMAKE_BINARY_DIR} pos)
    if(pos EQUAL -1)
-      list(APPEND src ${iter})
+      list(APPEND sources ${iter})
    endif()
  endforeach()
-  add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/uncrustify-${NAME}.cfg
+
+  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 ${PROJECT_BINARY_DIR}/uncrustify-${NAME}.cfg)
-                                             list(APPEND UNCRUSTIFY_OPTS -c ${PROJECT_BINARY_DIR}/uncrustify-${NAME}.cfg)
+                                               -c ${ARG_CONFIG} -o ${fixed_config})
+  list(APPEND options -c ${fixed_config})
  # cmake-format: off
-  add_custom_target(${NAME}-uncrustify-check
-    DEPENDS ${PROJECT_BINARY_DIR}/uncrustify-${NAME}.cfg
-    COMMAND ${UNCRUSTIFY_EXE} ${UNCRUSTIFY_OPTS} --check ${src})
+  add_custom_target(${TARGET_NAME}-uncrustify-check
+    DEPENDS ${fixed_config}
+    COMMAND ${UNCRUSTIFY_EXE} ${options} --check ${sources})

-  list(APPEND UNCRUSTIFY_OPTS --replace --no-backup)
-  add_custom_target(${NAME}-uncrustify
-    DEPENDS ${PROJECT_BINARY_DIR}/uncrustify-${NAME}.cfg
-    COMMAND ${UNCRUSTIFY_EXE} ${UNCRUSTIFY_OPTS} --mtime ${src})
+  list(APPEND options --replace --no-backup)
+  add_custom_target(${TARGET_NAME}-uncrustify
+    DEPENDS ${fixed_config}
+    COMMAND ${UNCRUSTIFY_EXE} ${options} --mtime ${sources})

-  add_custom_target(${NAME}-uncrustify-append-comments
-    DEPENDS ${PROJECT_BINARY_DIR}/uncrustify-${NAME}.cfg
-    COMMAND ${UNCRUSTIFY_EXE} ${UNCRUSTIFY_OPTS}
+  add_custom_target(${TARGET_NAME}-uncrustify-append-comments
+    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 ${src})
+            --set cmt_insert_before_ctor_dtor=true --mtime ${sources})
  # cmake-format: on

-  add_dependencies(myx-uncrustify ${NAME}-uncrustify)
-  add_dependencies(myx-uncrustify-check ${NAME}-uncrustify-check)
-  add_dependencies(myx-uncrustify-append-comments ${NAME}-uncrustify-append-comments)
+  add_dependencies(myx-uncrustify ${TARGET_NAME}-uncrustify)
+  add_dependencies(myx-uncrustify-check ${TARGET_NAME}-uncrustify-check)
+  add_dependencies(myx-uncrustify-append-comments ${TARGET_NAME}-uncrustify-append-comments)
 endfunction()
--- a/README.md
+++ b/README.md
@ -3,7 +3,7 @@
 ## Установка

 В корневом каталоге проекта создать каталог `cmake` и распаковать в него
-[архив](../../../releases/download/2.0.14/myx-cmake-local-2.0.14.tar.xz ).
+[архив](../../../releases/download/2.4.42/myx-cmake-local-2.4.42.tar.xz ).

 ## Использование

--- a/2
+++ b/2
@ -1 +1 @@
-2.0.14
+2.4.42
--- a/debian/CMakeLists.txt
+++ b/debian/CMakeLists.txt
@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.6 FATAL_ERROR)
-project(myx-cmake VERSION 2.0.14 LANGUAGES)
+project(myx-cmake VERSION 2.4.42 LANGUAGES)

 include(GNUInstallDirs)
 file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake
--- a/debian/changelog
+++ b/debian/changelog
@ -1,4 +1,4 @@
-myx-cmake (2.0.14) unstable; urgency=medium
+myx-cmake (2.4.42) unstable; urgency=medium

  * New version.

--- a/myx-unity.py
+++ b/myx-unity.py
@ -0,0 +1,40 @@
+#!/usr/bin/env python3
+
+"""MyxCMake unity."""
+
+import re
+import os
+from distutils.dir_util import copy_tree
+from shutil import copyfile
+
+D1 = 'MyxCMake'
+D2 = 'build/unity/myx'
+copy_tree(D1, D2)
+copyfile('myx_setup.cmake', 'build/unity/myx_setup.cmake')
+
+with open(D2 + '/MyxCMakeConfig.cmake', encoding='utf-8') as f:
+    lines = list(f)
+    for line in lines:
+        line = line.rstrip()
+        b1 = re.match('.*include.*_BACKPORTS_DIR}/(.*cmake)', line)
+        l1 = re.match('.*include.*_LIB_DIR}/(.*cmake)', line)
+        if b1:
+            fname = D2 + "/backports/" + b1.group(1)
+            with open(fname, encoding='utf-8') as g:
+                print(g.read())
+            os.remove(fname)
+        elif l1:
+            if l1.group(1) in ['DownloadContent.cmake',
+                               'ProjectIsTopLevel.cmake',
+                               'generators/PrivateConfigHeader.cmake',
+                               'generators/GitInfoHeader.cmake']:
+                print(line)
+                continue
+            fname = D2 + "/lib/" + l1.group(1)
+            with open(fname, encoding='utf-8') as g:
+                print(g.read())
+            os.remove(fname)
+        else:
+            print(line)
+
+os.rmdir(D2 + '/lib/macro')
--- a/myx_setup.cmake
+++ b/myx_setup.cmake
@ -4,7 +4,7 @@
 По умолчанию предполагается использование версии MyxCMake,
 файлы которой находятся в каталоге `cmake/myx` текущего проекта.

-Для удобства разботки библиотеки MyxCMake можно указать путь
+Для удобства разработки библиотеки MyxCMake можно указать путь
 к её репозиторию с помощью переменной проекта CMake `MYX_CMAKE_DIR`
 или переменной окружения `MYX_CMAKE_DIR`.

@ -12,7 +12,7 @@
 поиск версии в каталогах перечисленных в переменной `CMAKE_MODULES_DIR`.

 Кроме того выполняется попытка поиска (MyxxCMake)[../../../../myxx] --
-расширения для библиотеки, позволяющиего в режиме разработки программного
+расширения для библиотеки, позволяющего в режиме разработки программного
 проекта использовать дополнительные инструменты для его сопровождения.
 #]=======================================================================]

@ -20,15 +20,15 @@ if(ENV{MYX_CMAKE_DIR})
  set(MYX_CMAKE_DIR $ENV{MYX_CMAKE_DIR})
 endif()
 if(MYX_CMAKE_DIR)
-  find_package(MyxCMake 2.0.14 REQUIRED CONFIG PATHS ${MYX_CMAKE_DIR} NO_DEFAULT_PATH)
-  myx_message_notice("=== MyxCMake directory: ${MyxCMake_CONFIG} ===")
+  find_package(MyxCMake 2.4.42 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.0.14 REQUIRED)
-    myx_message_notice("=== MyxCMake directory: ${MyxCMake_CONFIG} ===")
+    find_package(MyxCMake 2.4.42 REQUIRED)
+    myx_message_notice("== MyxCMake directory: ${MyxCMake_CONFIG} ==")
  else()
    include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)
-    myx_message_notice("=== MyxCMake directory: ${PROJECT_SOURCE_DIR}/cmake/myx ===")
+    myx_message_notice("== MyxCMake directory: ${PROJECT_SOURCE_DIR}/cmake/myx ==")
  endif()
 endif()
Author	SHA1	Message	Date
Andrey Astafyev	14ee051dcb	2.4.42	2024-04-10 23:22:41 +03:00
Andrey Astafyev	669bbff8ef	2.4.41	2024-04-10 23:18:41 +03:00
Andrey Astafyev	f7790f34f4	2.4.40	2024-04-10 23:16:37 +03:00
Andrey Astafyev	96180b1e27	2.4.39	2024-04-10 23:14:04 +03:00
Andrey Astafyev	30616ab4e1	Улучшен поиск приватных компонент Qt	2024-04-10 23:12:29 +03:00
Andrey Astafyev	87cf523cd3	2.4.38	2024-04-08 22:49:13 +03:00
Andrei Astafev	4a7351c42b	2.4.37	2024-03-29 12:44:37 +03:00
Andrei Astafev	ecd6c35b21	2.4.36	2024-03-29 12:41:49 +03:00
Andrei Astafev	a3461df5b1	2.4.35	2024-03-29 12:33:45 +03:00
Andrei Astafev	18f3275a1d	2.4.34	2024-03-29 12:14:45 +03:00
Andrei Astafev	43a8bd00c1	2.4.33	2024-03-28 10:58:24 +03:00
Andrei Astafev	a4b841d852	Исправление включения файлов в интерфейсную библиотеку	2024-03-28 10:57:43 +03:00
Andrey Astafyev	01e095e99c	2.4.32	2024-03-19 01:00:53 +03:00
Andrey Astafyev	dfb47eee32	К исходникам цели добавлены публичные заголовки	2024-03-19 00:58:53 +03:00
Andrey Astafyev	5ff0ea7b2d	Переименования	2024-03-19 00:50:40 +03:00
Andrei Astafev	61650e44d1	2.4.31	2024-03-16 12:09:46 +03:00
Andrei Astafev	c61e9b7da0	2.4.30	2024-03-16 09:39:57 +03:00
Andrei Astafev	07cd3985e7	CMP0076	2024-03-16 09:39:43 +03:00
Andrei Astafev	52a21b1cc9	2.4.29	2024-03-12 16:30:05 +03:00
Andrei Astafev	986c924a6f	2.4.29	2024-03-12 16:29:03 +03:00
Andrei Astafev	bd49df9c7c	Опечатка	2024-03-12 16:27:42 +03:00
Andrei Astafev	205c4d7f80	Переименования	2024-03-12 16:27:30 +03:00
Andrei Astafev	2077833259	Заглушка для CMake < 3.13	2024-03-12 16:23:02 +03:00
Andrei Astafev	cbaf609100	2.4.28	2024-03-12 15:57:31 +03:00
Andrei Astafev	9e5b642d3f	2.4.26	2024-03-12 10:00:35 +03:00
Andrei Astafev	013b61ab75	2.4.25	2024-03-11 17:28:08 +03:00
Andrei Astafev	9333a7adfa	Работа с интерфейсной библиотекой в старых CMake	2024-03-11 17:26:43 +03:00
Andrei Astafev	1ee5df29d1	Полный путь к файлам для QTest	2024-03-11 13:51:29 +03:00
Andrei Astafev	47ed469e6e	2.4.24	2024-03-11 12:14:20 +03:00
Andrei Astafev	7a36a8c6e5	2.4.23	2024-03-10 09:03:45 +03:00
Andrei Astafev	602b88a2b3	2.4.22	2024-02-27 17:43:33 +03:00
Andrei Astafev	f69aa79360	2.4.21	2024-02-27 17:29:40 +03:00
Andrei Astafev	f56824ccc7	2.4.20	2024-02-12 16:46:01 +03:00
Andrei Astafev	2260a5ac5f	Совместимость c CMake 3.7	2024-02-12 16:45:38 +03:00
Andrei Astafev	42216b4f4f	Файл настроек убран из перечня исходников	2023-12-21 16:09:22 +03:00
Andrei Astafev	92e3d3441d	2.4.19	2023-12-14 14:02:07 +03:00
Andrei Astafev	3bc467fa13	Аргумент INCLUDE_DIRECTORIES для myx_target_setup	2023-12-14 14:00:20 +03:00
Andrei Astafev	846e02c1e7	2.4.18	2023-12-12 12:24:40 +03:00
Andrei Astafev	13a95cf650	Приватный заголовок запрещёл для нитерфейсной цели	2023-12-12 12:23:31 +03:00
Andrei Astafev	399a9f2464	Совместимость с CMake 3.7	2023-12-12 11:31:40 +03:00
Andrei Astafev	c04c9900c6	2.4.17	2023-09-14 14:44:47 +03:00
Andrei Astafev	bf8d01e785	Перенос строки	2023-09-14 14:20:00 +03:00
Andrei Astafev	acc54d4835	Вариант сборки, в котором функции объединены в один файл	2023-09-14 14:17:16 +03:00
Andrei Astafev	95ba4ba50a	2.4.14	2023-08-28 13:53:42 +03:00
Andrei Astafev	2bbb4a9b33	2.4.13	2023-08-28 13:40:57 +03:00
Andrei Astafev	f639f6eff5	2.4.12	2023-08-04 10:18:00 +03:00
Andrei Astafev	6fcba8642e	Исправлено имя переменной	2023-08-04 10:17:38 +03:00
Andrei Astafev	81f5bbbd1e	Оптимизация работы с загружаемым содержимым из git	2023-08-04 10:16:31 +03:00
Andrei Astafev	81d61deb9b	Вызов `add_subdirectory` только для каталогов с `CMakeLists.txt`	2023-08-03 16:54:23 +03:00
Andrei Astafev	8d27622312	2.4.11	2023-08-02 14:32:45 +03:00
Andrei Astafev	b5c3fd34b3	Флаг AUTOPULL	2023-08-02 14:31:48 +03:00
Andrei Astafev	3375e8b74d	2.4.10	2023-08-01 14:43:22 +03:00
Andrei Astafev	d2974d180f	Расширение у файла скомпилированных переводов	2023-08-01 14:41:11 +03:00
Andrei Astafev	03832447bf	Опечатки	2023-08-01 12:03:08 +03:00
Andrei Astafev	b1f6805c5e	2.4.9	2023-08-01 11:48:12 +03:00
Andrei Astafev	f22913db9d	Переход к HEAD, если не указан параметр GIT_TAG	2023-08-01 11:46:51 +03:00
Andrei Astafev	0c9573d005	Рефакторинг myx_find_qt	2023-08-01 11:42:24 +03:00
Andrei Astafev	1957cbdb5c	Работа с Qt	2023-08-01 11:21:33 +03:00
Andrei Astafev	e2258d1312	2.4.7	2023-07-31 15:33:18 +03:00
Andrei Astafev	f42e895eaa	Каталог для файлов локализации	2023-07-31 15:32:51 +03:00
Andrei Astafev	5086bfe47c	uncrustify выполняется только с файлом настройки из каталога CMAKE_SOURCE_DIR	2023-07-31 15:24:55 +03:00
Andrey Astafyev	969667e9b1	2.4.6	2023-07-31 12:18:19 +03:00
Andrey Astafyev	817f95f758	2.4.3	2023-07-30 19:00:41 +03:00
Andrey Astafyev	08bc393289	Функция для загрузки необходимого содержимого	2023-07-30 18:59:38 +03:00
Andrey Astafyev	cc731269be	Убрана отладочная печать	2023-07-30 18:38:08 +03:00
Andrey Astafyev	82e9a87f4d	Правка перечня аргументов для макроса `myx_qt_target_setup`	2023-07-30 15:45:31 +03:00
Andrey Astafyev	45cbff6f67	Вызовы функции `find_package` вынесены из функций	2023-07-30 15:38:11 +03:00
Andrey Astafyev	ed531c24dd	Мелкие правки	2023-07-30 14:29:25 +03:00
Andrey Astafyev	7bb6c2d39c	Замена myx_find_required_packages на myx_find_packages	2023-07-30 13:40:39 +03:00
Andrey Astafyev	fe65d429f1	Обобщённая поддержка для версий Qt 5 и 6	2023-07-30 13:32:04 +03:00
Andrey Astafyev	b817f24022	2.3.8	2023-07-30 11:27:10 +03:00
Andrey Astafyev	6615f47d41	Орфография	2023-07-30 11:06:38 +03:00
Andrey Astafyev	56e29e35c0	Поддержка Qt6	2023-07-30 10:10:29 +03:00
Andrey Astafyev	2246f06397	Подсветка сообщений, если установлена переменная окружения COLORTERM	2023-07-30 10:02:16 +03:00
Andrei Astafev	e42530855c	2.3.7	2023-07-27 14:27:39 +03:00
Andrey Astafyev	4a8e862212	Правка для CMake <= 3.16	2023-04-13 10:51:49 +03:00
Andrey Astafyev	063caa47cc	2.3.5	2023-04-13 09:59:38 +03:00
Andrey Astafyev	899afc37c5	Правки для CMake 3.7	2023-04-13 09:58:45 +03:00
Andrey Astafyev	93b9043b88	2.3.2	2023-03-23 13:55:38 +03:00
Andrey Astafyev	79fb2dc312	Исправлена установка переменной PROJECT_IS_TOP_LEVEL	2023-03-23 13:54:46 +03:00
Andrey Astafyev	e5598effe4	2.3.1	2023-02-17 14:24:08 +03:00
Andrey Astafyev	12ccb2768b	Исправлено подключение модуля	2023-02-17 14:21:39 +03:00
Andrey Astafyev	e8a0a5b556	Команда myx_add_external_target	2023-02-17 12:28:05 +03:00
Andrey Astafyev	d6b6cb39c7	2.2.7	2022-12-28 10:54:13 +03:00
Andrey Astafyev	57429ab3bb	2.2.6	2022-11-28 12:53:13 +03:00
Andrey Astafyev	8ae9f3db28	2.2.5	2022-11-28 12:40:11 +03:00
Andrey Astafyev	785c69f707	2.2.4	2022-11-28 07:13:09 +03:00
Andrey Astafyev	2a03264b98	Опечатка	2022-11-27 15:31:19 +03:00
Andrey Astafyev	0cc415dc9d	2.2.2	2022-11-27 07:09:09 +03:00
Andrey Astafyev	4c1e54173d	Тест для САПР	2022-11-17 13:28:38 +03:00
Andrey Astafyev	153715dee0	2.2.0	2022-11-07 13:41:48 +03:00
Andrey Astafyev	29baa9cce3	Работа со старыми версиями pybind	2022-11-07 13:40:55 +03:00
Andrey Astafyev	515eeb4b11	2.1.100	2022-11-02 17:39:45 +03:00
Andrey Astafyev	fba519c288	2.1.99	2022-11-02 15:51:08 +03:00
Andrey Astafyev	714a5561f7	2.1.98	2022-11-02 13:18:26 +03:00
Andrey Astafyev	19e5dc120b	2.1.97	2022-11-02 12:52:26 +03:00
Andrey Astafyev	37d9eab85b	2.1.96	2022-11-02 11:05:10 +03:00
Andrey Astafyev	23bd5660fd	2.1.95	2022-11-02 10:19:54 +03:00
Andrey Astafyev	3a5d9d874d	Поддержка САПР	2022-11-02 09:51:53 +03:00
Andrey Astafyev	96cdd184fa	2.1.93	2022-10-24 20:03:42 +03:00
Andrey Astafyev	b0dc31b1d5	2.1.92	2022-10-23 19:38:59 +03:00
Andrey Astafyev	df56d476f4	update	2022-10-21 10:52:33 +03:00
Andrey Astafyev	acfff07ec5	2.0.33	2022-10-21 03:15:34 +03:00
Andrey Astafyev	1c504e2328	2.0.31	2022-10-20 12:48:52 +03:00
Andrey Astafyev	e80b8d4a02	2.0.30	2022-10-20 12:45:27 +03:00
Andrey Astafyev	9f755b3bdb	2.0.29	2022-10-20 11:50:52 +03:00
Andrey Astafyev	9fe572822c	2.0.26	2022-10-19 20:51:13 +03:00
Andrey Astafyev	dae5cc0afe	2.0.25	2022-10-19 16:58:22 +03:00
Andrey Astafyev	c32b2a85cc	2.0.24	2022-10-19 14:39:26 +03:00
Andrey Astafyev	490b7a82d0	2.0.22	2022-10-18 07:48:16 +03:00
Andrey Astafyev	8c4594fd71	2.0.21	2022-10-15 10:14:08 +03:00
Andrey Astafyev	e87e190cd3	2.0.20	2022-10-14 17:50:39 +03:00
Andrey Astafyev	48377e27ec	2.0.19	2022-10-09 21:14:12 +03:00
Andrey Astafyev	703b8045ed	2.0.17	2022-10-09 04:23:55 +03:00
Andrey Astafyev	d8713fa8a6	2.0.16	2022-10-09 01:15:27 +03:00
Andrey Astafyev	58e7dfce22	2.0.15	2022-10-09 01:02:58 +03:00
 @ -1 +1 @@
 .0.14
 .4.42