1.99.73
This commit is contained in:
parent
45ca72b363
commit
79c12f1827
@ -1,4 +1,4 @@
|
||||
set(MYX_CMAKE_PACKAGE_VERSION "1.99.72")
|
||||
set(MYX_CMAKE_PACKAGE_VERSION "1.99.73")
|
||||
if(MYX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
|
||||
set(PACKAGE_VERSION_COMPATIBLE FALSE)
|
||||
else()
|
||||
|
@ -36,10 +36,10 @@ if(MYX_CMAKE_DIR)
|
||||
set(ENV{MYX_CMAKE_DIR} ${MYX_CMAKE_DIR})
|
||||
endif()
|
||||
if(DEFINED ENV{MYX_CMAKE_DIR})
|
||||
find_package(MyxCMake 1.99.72 REQUIRED)
|
||||
find_package(MyxCMake 1.99.73 REQUIRED)
|
||||
else()
|
||||
if(MYX_CMAKE_USE_SYSTEM)
|
||||
find_package(MyxCMake 1.99.72 REQUIRED)
|
||||
find_package(MyxCMake 1.99.73 REQUIRED)
|
||||
else()
|
||||
include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)
|
||||
endif()
|
||||
|
@ -46,11 +46,9 @@ function(myx_uncrustify target)
|
||||
|
||||
if(NOT ARG_CONFIG)
|
||||
set(ARG_CONFIG "${PROJECT_SOURCE_DIR}/.uncrustify.cfg")
|
||||
endif()
|
||||
|
||||
if(NOT UNCRUSTIFY_EXE)
|
||||
myx_message_notify("MyxCMake: uncrustify executable is not found")
|
||||
return()
|
||||
if(NOT EXISTS ${ARG_CONFIG})
|
||||
set(ARG_CONFIG "${CMAKE_SOURCE_DIR}/.uncrustify.cfg")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(NOT EXISTS ${ARG_CONFIG})
|
||||
@ -58,6 +56,11 @@ function(myx_uncrustify target)
|
||||
return()
|
||||
endif()
|
||||
|
||||
if(NOT UNCRUSTIFY_EXE)
|
||||
myx_message_notify("MyxCMake: uncrustify executable is not found")
|
||||
return()
|
||||
endif()
|
||||
|
||||
if(NOT TARGET myx-uncrustify)
|
||||
add_custom_target(myx-uncrustify)
|
||||
endif()
|
||||
@ -72,6 +75,7 @@ function(myx_uncrustify target)
|
||||
list(FILTER __sources EXCLUDE REGEX "qrc_.*\\.cpp$")
|
||||
list(FILTER __sources EXCLUDE REGEX "moc_.*\\.cpp$")
|
||||
list(FILTER __sources EXCLUDE REGEX "ui_.*\\.h$")
|
||||
list(FILTER __sources EXCLUDE REGEX ".*\\.qm$")
|
||||
|
||||
add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/uncrustify-${target}.cfg
|
||||
COMMAND ${UNCRUSTIFY_EXE} --update-config-with-doc
|
||||
|
Loading…
Reference in New Issue
Block a user