This commit is contained in:
2024-04-10 23:18:41 +03:00
parent f7790f34f4
commit 669bbff8ef
8 changed files with 12 additions and 12 deletions

View File

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

View File

@ -23,14 +23,14 @@ macro(myx_find_qt)
endif()
if(ARG_REQUIRED)
message("MyxCMake: searching required Qt private components: ${ARG_PRIVATE}")
message("-- MyxCMake: searching required Qt private components: ${ARG_PRIVATE}")
endif()
foreach(iter ${ARG_PRIVATE})
find_package("Qt${ARG_VERSION}${iter}" COMPONENTS Private ${ARG_REQUIRED})
endforeach()
if(ARG_REQUIRED)
message("MyxCMake: searching required Qt components: ${ARG_COMPONENTS}")
message("-- MyxCMake: searching required Qt components: ${ARG_COMPONENTS}")
endif()
foreach(iter ${ARG_COMPONENTS})
find_package(Qt${ARG_VERSION} COMPONENTS ${iter} ${ARG_REQUIRED})

View File

@ -19,18 +19,18 @@ function(myx_uncrustify TARGET_NAME)
endif()
if(NOT EXISTS ${ARG_CONFIG})
myx_message_notice("MyxCMake: uncrustify config is not found")
myx_message_notice("-- MyxCMake: uncrustify config is not found")
return()
endif()
if(NOT UNCRUSTIFY_EXE)
myx_message_notice("MyxCMake: uncrustify executable is not found")
myx_message_notice("-- MyxCMake: uncrustify executable is not found")
return()
endif()
get_filename_component(CONFIG_DIR ${ARG_CONFIG} DIRECTORY)
if(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CONFIG_DIR}")
myx_message("MyxCMake: skip uncrustify for project ${PROJECT_NAME}")
myx_message("-- MyxCMake: skip uncrustify for project ${PROJECT_NAME}")
return()
endif()