From e1badf6f69c61a1a2a5aa9ae4aadebcea94df617 Mon Sep 17 00:00:00 2001
From: Andrey Astafyev <dev@246060.ru>
Date: Fri, 8 Apr 2022 08:13:47 +0300
Subject: [PATCH] =?UTF-8?q?=D0=92=D0=B5=D1=80=D1=81=D0=B8=D1=8F=200.5.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CMakeLists.txt                                |  2 +-
 .../MyxCMakeCommonTargetProperties.cmake      | 42 ++-----------------
 2 files changed, 4 insertions(+), 40 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8e72919..9e1f489 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.0)
-project(myx-cmake VERSION 0.5.3 LANGUAGES)
+project(myx-cmake VERSION 0.5.5 LANGUAGES)
 
 include(GNUInstallDirs)
 file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake
diff --git a/MyxCMake/modules/MyxCMakeCommonTargetProperties.cmake b/MyxCMake/modules/MyxCMakeCommonTargetProperties.cmake
index 96d2e3d..2e561f1 100644
--- a/MyxCMake/modules/MyxCMakeCommonTargetProperties.cmake
+++ b/MyxCMake/modules/MyxCMakeCommonTargetProperties.cmake
@@ -1,5 +1,4 @@
-function(myx_cmake_compile_target_properties target)
-
+function(myx_cmake_common_target_properties target)
   if(NOT TARGET ${target})
     myx_cmake_message_error("MyxCMake: Target ${target} does not exists.")
   endif()
@@ -49,6 +48,8 @@ function(myx_cmake_compile_target_properties target)
              $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
              $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include>)
 
+  endif()
+
   target_compile_features(${target} ${__visibility} cxx_alias_templates cxx_nullptr cxx_override)
   if(_target_type STREQUAL EXECUTABLE)
     set_target_properties(${target} PROPERTIES
@@ -68,8 +69,6 @@ function(myx_cmake_compile_target_properties target)
     set_target_properties(${target} PROPERTIES POSITION_INDEPENDENT_CODE ON)
   endif()
 
-  endif()
-
   # LTO only for executables (not libraries) in Release build type
   if(_target_type STREQUAL EXECUTABLE AND CMAKE_BUILD_TYPE STREQUAL Release)
     check_cxx_compiler_flag(-flto CXX_HAS_LTO_FLAG)
@@ -105,12 +104,6 @@ function(myx_cmake_compile_target_properties target)
   target_compile_definitions(
     ${target} ${__visibility}
               "MYX_CMAKE_LSB_CODENAME_${MYX_CMAKE_LSB_CODENAME}")
-endfunction()
-
-
-function(myx_cmake_common_target_properties target)
-
-  myx_cmake_compile_target_properties(${target})
 
   myx_cmake_analyze_clang_tidy(${target})
   myx_cmake_analyze_clang_check(${target})
@@ -157,35 +150,6 @@ function(myx_cmake_common_target_properties target)
   endif()
 endfunction()
 
-
-function(myx_cmake_qt_autogen_target_properties target)
-
-  myx_cmake_compile_target_properties(${target})
-
-  get_target_property(_target_type ${target} TYPE)
-  if(NOT _target_type STREQUAL OBJECT_LIBRARY)
-    myx_cmake_message_error("MyxCMake: Target ${target} must have type OBJECT ${_target_type}.")
-  endif()
-
-  get_target_property(__sources ${target} SOURCES)
-  foreach(src IN LISTS __sources)
-    string(REGEX MATCH ".*/ui_.*\\.h$" __ui ${src})
-    if(__ui)
-      target_include_directories(${target} SYSTEM PUBLIC ${Qt5Widgets_INCLUDE_DIRS})
-    endif()
-  endforeach()
-
-  foreach(src IN LISTS __sources)
-    string(REGEX MATCH ".*/moc_.*\\.cpp$" __moc ${src})
-    if(__moc)
-      target_include_directories(${target} SYSTEM PUBLIC ${Qt5Core_INCLUDE_DIRS})
-    endif()
-  endforeach()
-
-  set_target_properties(${target} PROPERTIES CXX_CLANG_TIDY "")
-endfunction()
-
-
 function(myx_cmake_common_target_properties_post_link target)
   if(NOT TARGET ${target})
     myx_cmake_message_error("MyxCMake: Target ${target} does not exists.")