1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmake: Don't add include paths to module pri if there are no headers

Browse Source 
Change-Id: I8fa01f45410805399a511a87c6f04192ce42d374
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Tor Arne Vestbø 2020-10-18 15:51:25 +02:00
parent c3fd24164b
commit 6baa0f4ccc
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/QtPriHelpers.cmake
View File

@ -193,6 +193,12 @@ function(qt_generate_module_pri_file target)
set(module_name_in_pri "${module_versioned}") set(module_name_in_pri "${module_versioned}")
endif() endif()
get_target_property(hasModuleHeaders ${target} INTERFACE_MODULE_HAS_HEADERS)
if (NOT hasModuleHeaders)
unset(public_module_includes)
unset(private_module_includes)
endif()
qt_path_join(target_path ${QT_BUILD_DIR} ${INSTALL_MKSPECSDIR}/modules) qt_path_join(target_path ${QT_BUILD_DIR} ${INSTALL_MKSPECSDIR}/modules)
if (arg_INTERNAL_MODULE) if (arg_INTERNAL_MODULE)
string(PREPEND private_module_includes "${public_module_includes} ") string(PREPEND private_module_includes "${public_module_includes} ")