diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-10-27 16:47:32 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-11-09 18:08:02 +0100 |
| commit | c2e1a773e060ae34089f805eaab87394c5903a9e (patch) | |
| tree | 38a0faaa3a5dba526ca6d7d7c2e5a939d1a85303 | |
| parent | 250b69ace47923b51aaeaaea39e0ffc638fa4b4a (diff) | |
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 <alexandru.croitor@qt.io>
| -rw-r--r-- | cmake/QtPriHelpers.cmake | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake index b4c35cef7c..2dbacc59e6 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} |