cmake/myx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

2.0.30

Browse Source
This commit is contained in:
Andrei Astafev
2022-10-20 12:45:27 +03:00
parent 9f755b3bdb
commit e80b8d4a02
9 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MyxCMake/MyxCMakeConfigVersion.cmake
View File

@ -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()

5
MyxCMake/lib/AddInterfaceLibrary.cmake
View File

@ -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()

4
MyxCMake/lib/macro/CreateSymlink.cmake
View File

@ -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()

18
MyxCMake/lib/uncrustify/Uncrustify.cmake
View File

@ -46,13 +46,17 @@ function(myx_uncrustify TARGET_NAME)
endif()
# Динамически сгенерированные файлы исключаются
get_target_property(__s1 ${TARGET_NAME} INTERFACE_SOURCES)
if(__s1)
list(APPEND __all_sources ${__s1})
endif()
get_target_property(__s2 ${TARGET_NAME} SOURCES)
if(__s2)
list(APPEND __all_sources ${__s2})
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})