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

CMake: Fix non-existent include paths in private module .pri files

Browse Source 
Use our qt_internal_append_include_directories_with_headers_check
function to set up the internal include paths for private module .pri
files. This prevents writing non-existent include paths into those files.

Task-number: QTBUG-84628
Change-Id: I4634fc7892eb9672fa8227d4a7b4714b0c8b8edb
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by:  Alexey Edelev <alexey.edelev@qt.io>
This commit is contained in:
Joerg Bornemann 2024-07-09 14:50:11 +02:00
parent 469533fe81
commit e316f4ece8
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmake/QtPriHelpers.cmake
View File

@ -349,12 +349,18 @@ function(qt_generate_module_pri_file target)
set(framework_base_path "$$QT_MODULE_LIB_BASE") set(framework_base_path "$$QT_MODULE_LIB_BASE")
set(public_module_includes "${framework_base_path}/${fw_header_dir}") set(public_module_includes "${framework_base_path}/${fw_header_dir}")
set(public_module_frameworks "${framework_base_path}") set(public_module_frameworks "${framework_base_path}")
set(private_module_includes "${framework_base_path}/${fw_private_header_dir} \ set(private_module_includes "")
qt_internal_append_include_directories_with_headers_check(${target}
private_module_includes PRIVATE
"${framework_base_path}/${fw_private_header_dir} \
${framework_base_path}/${fw_private_module_header_dir}") ${framework_base_path}/${fw_private_module_header_dir}")
else() else()
set(public_module_includes "$$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/${module}") set(public_module_includes "$$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/${module}")
set(public_module_frameworks "") set(public_module_frameworks "")
set(private_module_includes "$$QT_MODULE_INCLUDE_BASE/${module_versioned_include_dir} \ set(private_module_includes "")
qt_internal_append_include_directories_with_headers_check(${target}
private_module_includes PRIVATE
"$$QT_MODULE_INCLUDE_BASE/${module_versioned_include_dir} \
$$QT_MODULE_INCLUDE_BASE/${module_versioned_inner_include_dir}") $$QT_MODULE_INCLUDE_BASE/${module_versioned_inner_include_dir}")
endif() endif()