From 08123ad2af494fa43b798f274a2c90a3d768c3e5 Mon Sep 17 00:00:00 2001
From: Andrey Astafyev <dev@246060.ru>
Date: Tue, 4 Oct 2022 12:58:19 +0300
Subject: [PATCH] 1.99.74

---
 MyxCMakeConfigVersion.cmake | 2 +-
 README.md                   | 4 ++--
 VERSION                     | 2 +-
 lib/Qt5TargetSetup.cmake    | 7 ++++---
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/MyxCMakeConfigVersion.cmake b/MyxCMakeConfigVersion.cmake
index 379e87a..4e5d8e5 100644
--- a/MyxCMakeConfigVersion.cmake
+++ b/MyxCMakeConfigVersion.cmake
@@ -1,4 +1,4 @@
-set(MYX_CMAKE_PACKAGE_VERSION "1.99.73")
+set(MYX_CMAKE_PACKAGE_VERSION "1.99.74")
 if(MYX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
   set(PACKAGE_VERSION_COMPATIBLE FALSE)
 else()
diff --git a/README.md b/README.md
index 67798ac..4c54c9d 100644
--- a/README.md
+++ b/README.md
@@ -36,10 +36,10 @@ if(MYX_CMAKE_DIR)
   set(ENV{MYX_CMAKE_DIR} ${MYX_CMAKE_DIR})
 endif()
 if(DEFINED ENV{MYX_CMAKE_DIR})
-  find_package(MyxCMake 1.99.73 REQUIRED)
+  find_package(MyxCMake 1.99.74 REQUIRED)
 else()
   if(MYX_CMAKE_USE_SYSTEM)
-    find_package(MyxCMake 1.99.73 REQUIRED)
+    find_package(MyxCMake 1.99.74 REQUIRED)
   else()
     include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)
   endif()
diff --git a/VERSION b/VERSION
index 6223a16..8bd4eda 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.99.73
+1.99.74
diff --git a/lib/Qt5TargetSetup.cmake b/lib/Qt5TargetSetup.cmake
index 15a01c8..a0923b4 100644
--- a/lib/Qt5TargetSetup.cmake
+++ b/lib/Qt5TargetSetup.cmake
@@ -57,12 +57,12 @@ function(myx_qt5_target_setup NAME)
     target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_BINARY_DIR})
   endif()
 
+  # Перечень файлов, подлежащих переводу
+  get_target_property(tr ${NAME} TR_FILES)
   # Формирование файла ресурсов с переводами
-  if("LinguistTools" IN_LIST ARG_COMPONENTS)
+  if("LinguistTools" IN_LIST ARG_COMPONENTS AND tr)
     # Заглавие файла ресурсов
     file(WRITE ${PROJECT_BINARY_DIR}/${NAME}_l10n.qrc "<RCC><qresource prefix=\"/qm\">\n")
-    # Перечень файлов, подлежащих переводу
-    get_target_property(tr ${NAME} TR_FILES)
     # Для каждого языка, указанное в параметре LANGS
     foreach(iter ${ARG_LANGS})
       # Создание или обновление файла переводов в каталоге ${PROJECT_SOURCE_DIR}/l10n
@@ -80,6 +80,7 @@ function(myx_qt5_target_setup NAME)
     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})
 
   # Установка публичных заголовочных файлов