myx update
This commit is contained in:
@@ -19,10 +19,7 @@ function(myx_uncrustify TARGET_NAME)
|
||||
cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
|
||||
|
||||
if(NOT ARG_CONFIG)
|
||||
set(ARG_CONFIG "${PROJECT_SOURCE_DIR}/.uncrustify.cfg")
|
||||
if(NOT EXISTS ${ARG_CONFIG})
|
||||
set(ARG_CONFIG "${CMAKE_SOURCE_DIR}/.uncrustify.cfg")
|
||||
endif()
|
||||
set(ARG_CONFIG "${PROJECT_SOURCE_DIR}/uncrustify.cfg")
|
||||
endif()
|
||||
|
||||
if(NOT EXISTS ${ARG_CONFIG})
|
||||
@@ -47,7 +44,7 @@ function(myx_uncrustify TARGET_NAME)
|
||||
|
||||
# Динамически сгенерированные файлы исключаются
|
||||
get_target_property(__target_type ${TARGET_NAME} TYPE)
|
||||
if((${__target_type} STREQUAL "INTERFACE_LIBRARY") AND (${CMAKE_VERSION} VERSION_LESS "3.15.0"))
|
||||
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})
|
||||
@@ -66,9 +63,10 @@ function(myx_uncrustify TARGET_NAME)
|
||||
endif()
|
||||
endforeach()
|
||||
|
||||
target_sources(${TARGET_NAME} PRIVATE ${ARG_CONFIG})
|
||||
set(__fixed_config ${PROJECT_BINARY_DIR}/uncrustify-${TARGET_NAME}.cfg)
|
||||
|
||||
add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/uncrustify-${TARGET_NAME}.cfg
|
||||
add_custom_command(OUTPUT ${__fixed_config}
|
||||
DEPENDS ${ARG_CONFIG}
|
||||
COMMAND ${UNCRUSTIFY_EXE} --update-config-with-doc
|
||||
-c ${ARG_CONFIG} -o ${__fixed_config})
|
||||
list(APPEND __options -c ${__fixed_config})
|
||||
|
Reference in New Issue
Block a user