AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't add module pri library entry for header modules

Browse Source 
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 <alexandru.croitor@qt.io>
This commit is contained in:
Tor Arne Vestbø 2020-10-27 16:47:32 +01:00
parent 250b69ace4
commit c2e1a773e0
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/QtPriHelpers.cmake
View File

@ -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}