From 57429ab3bb1d57c2455c4da586aaf8178135842d Mon Sep 17 00:00:00 2001
From: Andrey Astafyev <dev@246060.ru>
Date: Mon, 28 Nov 2022 12:53:13 +0300
Subject: [PATCH] 2.2.6

---
 MyxCMake/MyxCMakeConfigVersion.cmake | 2 +-
 MyxCMake/lib/macro/QTest.cmake       | 9 ++++++---
 README.md                            | 2 +-
 VERSION                              | 2 +-
 debian/CMakeLists.txt                | 2 +-
 debian/changelog                     | 2 +-
 myx_setup.cmake                      | 4 ++--
 7 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/MyxCMake/MyxCMakeConfigVersion.cmake b/MyxCMake/MyxCMakeConfigVersion.cmake
index 97462a2..bf1a2df 100644
--- a/MyxCMake/MyxCMakeConfigVersion.cmake
+++ b/MyxCMake/MyxCMakeConfigVersion.cmake
@@ -1,4 +1,4 @@
-set(MYX_CMAKE_PACKAGE_VERSION "2.2.5")
+set(MYX_CMAKE_PACKAGE_VERSION "2.2.6")
 if(MYX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
   set(PACKAGE_VERSION_COMPATIBLE FALSE)
 else()
diff --git a/MyxCMake/lib/macro/QTest.cmake b/MyxCMake/lib/macro/QTest.cmake
index 1f296ff..f77cf04 100644
--- a/MyxCMake/lib/macro/QTest.cmake
+++ b/MyxCMake/lib/macro/QTest.cmake
@@ -6,9 +6,10 @@ macro(myx_add_qtest TARGET_NAME)
   set(multiValueArgs)
   cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
-  find_package(Qt5 COMPONENTS Test REQUIRED)
-  if(Qt5_Test_FOUND)
-    target_link_libraries(${TARGET_NAME} Qt5::Core Qt5::Test)
+  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})
@@ -20,6 +21,8 @@ macro(myx_add_qtest TARGET_NAME)
   endforeach()
 
   add_executable(${TARGET_NAME} ${mocs} ${cpps} ${hpps})
+  target_link_libraries(${TARGET_NAME} Qt5::Core Qt5::Test)
+
   add_test(NAME ${TARGET_NAME} COMMAND ${TARGET_NAME})
 
   unset(cpps)
diff --git a/README.md b/README.md
index 47793e8..aef1493 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 ## Установка
 
 В корневом каталоге проекта создать каталог `cmake` и распаковать в него
-[архив](../../../releases/download/2.2.5/myx-cmake-local-2.2.5.tar.xz ).
+[архив](../../../releases/download/2.2.6/myx-cmake-local-2.2.6.tar.xz ).
 
 ## Использование
 
diff --git a/VERSION b/VERSION
index 21bb5e1..bda8fbe 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.2.5
+2.2.6
diff --git a/debian/CMakeLists.txt b/debian/CMakeLists.txt
index 83a51cf..2cf3497 100644
--- 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.2.5 LANGUAGES)
+project(myx-cmake VERSION 2.2.6 LANGUAGES)
 
 include(GNUInstallDirs)
 file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake
diff --git a/debian/changelog b/debian/changelog
index 98f0256..7c4bfa8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-myx-cmake (2.2.5) unstable; urgency=medium
+myx-cmake (2.2.6) unstable; urgency=medium
 
   * New version.
 
diff --git a/myx_setup.cmake b/myx_setup.cmake
index fecfb17..86a7371 100644
--- a/myx_setup.cmake
+++ b/myx_setup.cmake
@@ -20,11 +20,11 @@ if(ENV{MYX_CMAKE_DIR})
   set(MYX_CMAKE_DIR $ENV{MYX_CMAKE_DIR})
 endif()
 if(MYX_CMAKE_DIR)
-  find_package(MyxCMake 2.2.5 REQUIRED CONFIG PATHS ${MYX_CMAKE_DIR} NO_DEFAULT_PATH)
+  find_package(MyxCMake 2.2.6 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.2.5 REQUIRED)
+    find_package(MyxCMake 2.2.6 REQUIRED)
     myx_message_notice("=== MyxCMake directory: ${MyxCMake_CONFIG} ===")
   else()
     include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)