Улучшен поиск приватных компонент Qt

This commit is contained in:
Andrei Astafev 2024-04-10 23:12:29 +03:00
parent 87cf523cd3
commit 30616ab4e1

View File

@ -22,13 +22,20 @@ macro(myx_find_qt)
message(FATAL_ERROR "Supported Qt versions are 5 and 6") message(FATAL_ERROR "Supported Qt versions are 5 and 6")
endif() endif()
if(ARG_REQUIRED)
myx_message_notice("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)
myx_message_notice("MyxCMake: searching required Qt components: ${ARG_COMPONENTS}")
endif()
foreach(iter ${ARG_COMPONENTS}) foreach(iter ${ARG_COMPONENTS})
find_package(Qt${ARG_VERSION} COMPONENTS ${iter} ${ARG_REQUIRED}) find_package(Qt${ARG_VERSION} COMPONENTS ${iter} ${ARG_REQUIRED})
endforeach() endforeach()
foreach(iter ${ARG_PRIVATE})
find_package("Qt${ARG_VERSION}${iter}" COMPONENTS Private ${ARG_REQUIRED})
endforeach()
foreach(iter IN LISTS oneValueArgs multiValueArgs) foreach(iter IN LISTS oneValueArgs multiValueArgs)
unset(ARG_${iter}) unset(ARG_${iter})