From acfff07ec51553a8c201e4f0bb017b10fcb9cdf3 Mon Sep 17 00:00:00 2001
From: Andrey Astafyev <dev@246060.ru>
Date: Fri, 21 Oct 2022 03:15:34 +0300
Subject: [PATCH] 2.0.33

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

diff --git a/MyxCMake/MyxCMakeConfigVersion.cmake b/MyxCMake/MyxCMakeConfigVersion.cmake
index c849949..7e386cb 100644
--- a/MyxCMake/MyxCMakeConfigVersion.cmake
+++ b/MyxCMake/MyxCMakeConfigVersion.cmake
@@ -1,4 +1,4 @@
-set(MYX_CMAKE_PACKAGE_VERSION "2.0.30")
+set(MYX_CMAKE_PACKAGE_VERSION "2.0.33")
 if(MYX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
   set(PACKAGE_VERSION_COMPATIBLE FALSE)
 else()
diff --git a/MyxCMake/lib/generators/GitInfoHeader.cmake b/MyxCMake/lib/generators/GitInfoHeader.cmake
index 5c4fa37..9fd35a3 100644
--- a/MyxCMake/lib/generators/GitInfoHeader.cmake
+++ b/MyxCMake/lib/generators/GitInfoHeader.cmake
@@ -52,4 +52,5 @@ function(myx_generate_git_info_header TARGET_NAME BASE_FILENAME)
 
   set_property(TARGET ${TARGET_NAME} APPEND PROPERTY PRIVATE_HEADER_FILES ${__filename})
   target_sources(${TARGET_NAME} PRIVATE ${__filename})
+  add_dependencies(${TARGET_NAME} ${TARGET_NAME}-git-info-header)
 endfunction()
diff --git a/MyxCMake/lib/uncrustify/Uncrustify.cmake b/MyxCMake/lib/uncrustify/Uncrustify.cmake
index 073ee21..25d54bd 100644
--- a/MyxCMake/lib/uncrustify/Uncrustify.cmake
+++ b/MyxCMake/lib/uncrustify/Uncrustify.cmake
@@ -47,7 +47,7 @@ function(myx_uncrustify TARGET_NAME)
 
   # Динамически сгенерированные файлы исключаются
   get_target_property(__target_type ${TARGET_NAME} TYPE)
-  if(${__target_type} STREQUAL "INTERFACE_LIBRARY")
+  if((${__target_type} STREQUAL "INTERFACE_LIBRARY") AND (${CMAKE_VERSION} VERSION_LESS "3.17.0"))
     get_target_property(__s1 ${TARGET_NAME} INTERFACE_SOURCES)
     if(__s1)
       list(APPEND __all_sources ${__s1})
diff --git a/README.md b/README.md
index b1fa7d7..cde551a 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 ## Установка
 
 В корневом каталоге проекта создать каталог `cmake` и распаковать в него
-[архив](../../../releases/download/2.0.31/myx-cmake-local-2.0.31.tar.xz ).
+[архив](../../../releases/download/2.0.33/myx-cmake-local-2.0.33.tar.xz ).
 
 ## Использование
 
diff --git a/VERSION b/VERSION
index e235558..520d2d2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0.31
+2.0.33
diff --git a/debian/CMakeLists.txt b/debian/CMakeLists.txt
index 10dfb3a..ecffec7 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.0.31 LANGUAGES)
+project(myx-cmake VERSION 2.0.33 LANGUAGES)
 
 include(GNUInstallDirs)
 file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake
diff --git a/debian/changelog b/debian/changelog
index 3b3809e..eb4b55f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-myx-cmake (2.0.31) unstable; urgency=medium
+myx-cmake (2.0.33) unstable; urgency=medium
 
   * New version.
 
diff --git a/myx_setup.cmake b/myx_setup.cmake
index 0178b3c..6f254ba 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.0.31 REQUIRED CONFIG PATHS ${MYX_CMAKE_DIR} NO_DEFAULT_PATH)
+  find_package(MyxCMake 2.0.33 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.31 REQUIRED)
+    find_package(MyxCMake 2.0.33 REQUIRED)
     myx_message_notice("=== MyxCMake directory: ${MyxCMake_CONFIG} ===")
   else()
     include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)