From 0cc415dc9d0f8dc63ff7f4a786fa6c5e81e070b1 Mon Sep 17 00:00:00 2001
From: Andrey Astafyev <dev@246060.ru>
Date: Sun, 27 Nov 2022 07:09:09 +0300
Subject: [PATCH] 2.2.2

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

diff --git a/MyxCMake/MyxCMakeConfigVersion.cmake b/MyxCMake/MyxCMakeConfigVersion.cmake
index b72dba8..6efb31d 100644
--- a/MyxCMake/MyxCMakeConfigVersion.cmake
+++ b/MyxCMake/MyxCMakeConfigVersion.cmake
@@ -1,4 +1,4 @@
-set(MYX_CMAKE_PACKAGE_VERSION "2.2.1")
+set(MYX_CMAKE_PACKAGE_VERSION "2.2.2")
 if(MYX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
   set(PACKAGE_VERSION_COMPATIBLE FALSE)
 else()
diff --git a/MyxCMake/lib/uncrustify/Uncrustify.cmake b/MyxCMake/lib/uncrustify/Uncrustify.cmake
index fedd417..9aa61a6 100644
--- a/MyxCMake/lib/uncrustify/Uncrustify.cmake
+++ b/MyxCMake/lib/uncrustify/Uncrustify.cmake
@@ -19,10 +19,7 @@ function(myx_uncrustify TARGET_NAME)
   cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
   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})
@@ -66,8 +63,8 @@ function(myx_uncrustify TARGET_NAME)
     endif()
   endforeach()
 
+  target_source(${TARGET_NAME} PRIVATE ${ARG_CONFIG})
   set(__fixed_config ${PROJECT_BINARY_DIR}/uncrustify-${TARGET_NAME}.cfg)
-
   add_custom_command(OUTPUT ${__fixed_config}
                      DEPENDS ${ARG_CONFIG}
                      COMMAND ${UNCRUSTIFY_EXE} --update-config-with-doc
diff --git a/README.md b/README.md
index 85c42de..4030be0 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 ## Установка
 
 В корневом каталоге проекта создать каталог `cmake` и распаковать в него
-[архив](../../../releases/download/2.2.1/myx-cmake-local-2.2.1.tar.xz ).
+[архив](../../../releases/download/2.2.2/myx-cmake-local-2.2.2.tar.xz ).
 
 ## Использование
 
diff --git a/VERSION b/VERSION
index c043eea..b1b25a5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.2.1
+2.2.2
diff --git a/debian/CMakeLists.txt b/debian/CMakeLists.txt
index 550f8fa..d37ce0f 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.1 LANGUAGES)
+project(myx-cmake VERSION 2.2.2 LANGUAGES)
 
 include(GNUInstallDirs)
 file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake
diff --git a/debian/changelog b/debian/changelog
index 4cfab9f..f092610 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-myx-cmake (2.2.1) unstable; urgency=medium
+myx-cmake (2.2.2) unstable; urgency=medium
 
   * New version.
 
diff --git a/myx_setup.cmake b/myx_setup.cmake
index bd0ba3a..7cfcda2 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.1 REQUIRED CONFIG PATHS ${MYX_CMAKE_DIR} NO_DEFAULT_PATH)
+  find_package(MyxCMake 2.2.2 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.1 REQUIRED)
+    find_package(MyxCMake 2.2.2 REQUIRED)
     myx_message_notice("=== MyxCMake directory: ${MyxCMake_CONFIG} ===")
   else()
     include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)