From c2e1a773e060ae34089f805eaab87394c5903a9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Tue, 27 Oct 2020 16:47:32 +0100 Subject: [PATCH] Don't add module pri library entry for header modules The QT.foo.module entry is used for linkage, so we shouldn't add it for header only modules. Change-Id: Ibb6e7ab08083ccab11d7e060f35c54153e3751c0 Reviewed-by: Alexandru Croitor --- cmake/QtPriHelpers.cmake | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake index b4c35cef7c1..2dbacc59e66 100644 --- a/cmake/QtPriHelpers.cmake +++ b/cmake/QtPriHelpers.cmake @@ -206,6 +206,12 @@ function(qt_generate_module_pri_file target) set(module_name_in_pri "${module_versioned}") endif() + if(arg_HEADER_MODULE) + set(module_name_in_pri "") + else() + set(module_name_in_pri "${module_name_in_pri}${QT_LIBINFIX}") + endif() + get_target_property(hasModuleHeaders ${target} INTERFACE_MODULE_HAS_HEADERS) if (NOT hasModuleHeaders) unset(public_module_includes) @@ -268,7 +274,7 @@ function(qt_generate_module_pri_file target) CONTENT "QT.${config_module_name}.VERSION = ${PROJECT_VERSION} QT.${config_module_name}.name = ${module} -QT.${config_module_name}.module = ${module_name_in_pri}${QT_LIBINFIX} +QT.${config_module_name}.module = ${module_name_in_pri} QT.${config_module_name}.libs = $$QT_MODULE_LIB_BASE QT.${config_module_name}.ldflags = ${module_ldflags} QT.${config_module_name}.includes = ${public_module_includes}