From a5d2aa15e075bacb8b61a8ad0861eab641ff6a5c Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 1 Jan 2021 18:32:27 +0100 Subject: [PATCH] Support Qt 6 modules when generating the dependency list for the config header --- cmake/modules/ConfigHeader.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake/modules/ConfigHeader.cmake b/cmake/modules/ConfigHeader.cmake index 1ec7a15..7d92a3f 100644 --- a/cmake/modules/ConfigHeader.cmake +++ b/cmake/modules/ConfigHeader.cmake @@ -35,12 +35,15 @@ foreach (DEPENDENCY IN LISTS LINK_LIBRARIES_LIST INTERFACE_LINK_LIBRARIES_LIST) # find version and display name for target unset(DEPENDENCY_VER) unset(DEPENDENCY_DISPLAY_NAME) - if (DEPENDENCY MATCHES "((Static)?Qt5)::([A-Za-z0-9]+)") + if (DEPENDENCY MATCHES "((Static)?Qt[0-9]+)::([A-Za-z0-9]+)") # read meta-data of Qt module set(DEPENDENCY_MODULE_PREFIX "${CMAKE_MATCH_1}") set(DEPENDENCY_MODULE_NAME "${CMAKE_MATCH_3}") set(DEPENDENCY_DISPLAY_NAME "Qt ${DEPENDENCY_MODULE_NAME}") set(DEPENDENCY_VER "${${DEPENDENCY_MODULE_PREFIX}${DEPENDENCY_MODULE_NAME}_VERSION_STRING}") + if (NOT DEPENDENCY_VER) + set(DEPENDENCY_VER "${${DEPENDENCY_MODULE_PREFIX}${DEPENDENCY_MODULE_NAME}_VERSION}") + endif () elseif (DEPENDENCY STREQUAL ZLIB::ZLIB) set(DEPENDENCY_DISPLAY_NAME "zlib") set(DEPENDENCY_VER "${ZLIB_VERSION_STRING}")