From 56e29e35c06afcfebdc3e03a8927102c0c3b9580 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Sun, 30 Jul 2023 10:10:29 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6?= =?UTF-8?q?=D0=BA=D0=B0=20Qt6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MyxCMake/lib/macro/FindPackages.cmake | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/MyxCMake/lib/macro/FindPackages.cmake b/MyxCMake/lib/macro/FindPackages.cmake index ff57ccc..eecd465 100644 --- a/MyxCMake/lib/macro/FindPackages.cmake +++ b/MyxCMake/lib/macro/FindPackages.cmake @@ -3,7 +3,7 @@ include_guard(GLOBAL) macro(myx_find_required_packages) set(options) set(oneValueArgs) - set(multiValueArgs PACKAGES Boost Qt5 Qt5Private) + set(multiValueArgs PACKAGES Boost Qt5 Qt5Private Qt6 Qt6Private) cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) foreach(iter ${ARG_PACKAGES}) @@ -24,6 +24,16 @@ macro(myx_find_required_packages) endforeach() endif() + if(ARG_Qt6) + find_package(Qt6 COMPONENTS ${ARG_Qt6} REQUIRED) + endif() + + if(ARG_Qt6Private) + foreach(iter ${ARG_Qt6Private}) + find_package("Qt6${iter}" COMPONENTS Private REQUIRED) + endforeach() + endif() + foreach(__iter IN LISTS oneValueArgs multiValueArgs) unset(ARG_${__iter}) endforeach()