From f69aa793606d40a695be75c1d776c9c125a564db Mon Sep 17 00:00:00 2001
From: Andrei Astafev <dev@246060.ru>
Date: Tue, 27 Feb 2024 17:29:40 +0300
Subject: [PATCH] 2.4.21

---
 MyxCMake/MyxCMakeConfigVersion.cmake |  2 +-
 MyxCMake/lib/TargetSetupQt.cmake     | 28 ++++++++++++++--------------
 README.md                            |  2 +-
 VERSION                              |  2 +-
 debian/CMakeLists.txt                |  2 +-
 debian/changelog                     |  2 +-
 myx_setup.cmake                      |  4 ++--
 7 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/MyxCMake/MyxCMakeConfigVersion.cmake b/MyxCMake/MyxCMakeConfigVersion.cmake
index 6859dbc..868f515 100644
--- a/MyxCMake/MyxCMakeConfigVersion.cmake
+++ b/MyxCMake/MyxCMakeConfigVersion.cmake
@@ -1,4 +1,4 @@
-set(MYX_CMAKE_PACKAGE_VERSION "2.4.20")
+set(MYX_CMAKE_PACKAGE_VERSION "2.4.21")
 if(MYX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
   set(PACKAGE_VERSION_COMPATIBLE FALSE)
 else()
diff --git a/MyxCMake/lib/TargetSetupQt.cmake b/MyxCMake/lib/TargetSetupQt.cmake
index f28a6aa..db27b2b 100644
--- a/MyxCMake/lib/TargetSetupQt.cmake
+++ b/MyxCMake/lib/TargetSetupQt.cmake
@@ -20,21 +20,21 @@ function(myx_target_setup_qt TARGET_NAME)
 
   foreach(iter ${ARG_COMPONENTS})
     if(__target_type STREQUAL "INTERFACE_LIBRARY")
-      target_include_directories(${TARGET_NAME} INTERFACE ${Qt5${iter}_INCLUDE_DIRS})
+      target_include_directories(${TARGET_NAME} INTERFACE ${Qt${myx_qt_ver}${iter}_INCLUDE_DIRS})
     else()
-      target_include_directories(${TARGET_NAME} PRIVATE ${Qt5${iter}_INCLUDE_DIRS})
-    endif()
-    if(NOT iter STREQUAL "LinguistTools")
-      if(__target_type STREQUAL "EXECUTABLE")
-        target_link_libraries(${TARGET_NAME} PRIVATE 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})
+      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()
diff --git a/README.md b/README.md
index 745008c..adebe79 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 ## Установка
 
 В корневом каталоге проекта создать каталог `cmake` и распаковать в него
-[архив](../../../releases/download/2.4.20/myx-cmake-local-2.4.20.tar.xz ).
+[архив](../../../releases/download/2.4.21/myx-cmake-local-2.4.21.tar.xz ).
 
 ## Использование
 
diff --git a/VERSION b/VERSION
index a3ab538..197c455 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.4.20
+2.4.21
diff --git a/debian/CMakeLists.txt b/debian/CMakeLists.txt
index 852f4eb..9653b18 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.4.20 LANGUAGES)
+project(myx-cmake VERSION 2.4.21 LANGUAGES)
 
 include(GNUInstallDirs)
 file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake
diff --git a/debian/changelog b/debian/changelog
index a89dc8b..8990921 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-myx-cmake (2.4.20) unstable; urgency=medium
+myx-cmake (2.4.21) unstable; urgency=medium
 
   * New version.
 
diff --git a/myx_setup.cmake b/myx_setup.cmake
index ccb320b..4dfb0ea 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.4.20 REQUIRED CONFIG PATHS ${MYX_CMAKE_DIR} NO_DEFAULT_PATH)
+  find_package(MyxCMake 2.4.21 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.4.20 REQUIRED)
+    find_package(MyxCMake 2.4.21 REQUIRED)
     myx_message_notice("== MyxCMake directory: ${MyxCMake_CONFIG} ==")
   else()
     include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)