2.0.33

2022-10-21 03:15:34 +03:00
parent 1c504e2328
commit acfff07ec5
8 changed files with 9 additions and 8 deletions
--- 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()
--- 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()
--- 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})