2.0.30

MyxCMake/MyxCMakeConfigVersion.cmake

@@ -1,4 +1,4 @@
-set(MYX_CMAKE_PACKAGE_VERSION "2.0.29")
+set(MYX_CMAKE_PACKAGE_VERSION "2.0.30")
 if(MYX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
   set(PACKAGE_VERSION_COMPATIBLE FALSE)
 else()

MyxCMake/lib/AddInterfaceLibrary.cmake

@@ -48,10 +48,9 @@ function(myx_add_interface_library TARGET_NAME)
   endif()
 
   # Вызов стандартной функции `add_library()`
-  if(${CMAKE_VERSION} VERSION_LESS "3.13.0")
+  if(${CMAKE_VERSION} VERSION_LESS "3.19.0")
     add_library(${TARGET_NAME} INTERFACE)
-    # TODO
-#    target_sources(${TARGET_NAME} INTERFACE ${ARG_HEADERS})
+    target_sources(${TARGET_NAME} INTERFACE $<BUILD_INTERFACE:${ARG_HEADERS}>)
   else()
     add_library(${TARGET_NAME} INTERFACE ${ARG_HEADERS})
   endif()

MyxCMake/lib/macro/CreateSymlink.cmake

@@ -1,9 +1,9 @@
 include_guard(GLOBAL)
 
 macro(myx_create_symlink original linkname)
-  if(NOT EXISTS ${linkname})
+  if(UNIX AND (NOT EXISTS ${linkname}))
     if(${CMAKE_VERSION} VERSION_LESS "3.14.0")
-      execute_process(COMMAND ${CMAKE_COMMAND} -E myx_create_symlink ${original} ${linkname})
+      execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${original} ${linkname})
     else()
       file(CREATE_LINK ${original} ${linkname} SYMBOLIC)
     endif()

MyxCMake/lib/uncrustify/Uncrustify.cmake

@@ -46,14 +46,18 @@ function(myx_uncrustify TARGET_NAME)
   endif()
 
   # Динамически сгенерированные файлы исключаются
+  get_target_property(__target_type ${TARGET_NAME} TYPE)
+  if(${__target_type} STREQUAL "INTERFACE_LIBRARY")
     get_target_property(__s1 ${TARGET_NAME} INTERFACE_SOURCES)
     if(__s1)
       list(APPEND __all_sources ${__s1})
     endif()
+  else()
     get_target_property(__s2 ${TARGET_NAME} SOURCES)
     if(__s2)
       list(APPEND __all_sources ${__s2})
     endif()
+  endif()
 
   foreach(iter ${__all_sources})
     string(FIND ${iter} ${CMAKE_BINARY_DIR} pos)

README.md

@@ -3,7 +3,7 @@
 ## Установка
 
 В корневом каталоге проекта создать каталог `cmake` и распаковать в него
-[архив](../../../releases/download/2.0.29/myx-cmake-local-2.0.29.tar.xz ).
+[архив](../../../releases/download/2.0.30/myx-cmake-local-2.0.30.tar.xz ).
 
 ## Использование
 

VERSION

@@ -1 +1 @@
-2.0.29
+2.0.30

debian/CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.6 FATAL_ERROR)
-project(myx-cmake VERSION 2.0.29 LANGUAGES)
+project(myx-cmake VERSION 2.0.30 LANGUAGES)
 
 include(GNUInstallDirs)
 file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake

debian/changelog

@@ -1,4 +1,4 @@
-myx-cmake (2.0.29) unstable; urgency=medium
+myx-cmake (2.0.30) unstable; urgency=medium
 
   * New version.
 

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.29 REQUIRED CONFIG PATHS ${MYX_CMAKE_DIR} NO_DEFAULT_PATH)
+  find_package(MyxCMake 2.0.30 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.29 REQUIRED)
+    find_package(MyxCMake 2.0.30 REQUIRED)
     myx_message_notice("=== MyxCMake directory: ${MyxCMake_CONFIG} ===")
   else()
     include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)