From e316f4ece8c636e5559fab9e8989786c36f9c19e Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 9 Jul 2024 14:50:11 +0200 Subject: [PATCH] CMake: Fix non-existent include paths in private module .pri files 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 Reviewed-by: Alexey Edelev --- cmake/QtPriHelpers.cmake | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake index c3b13c7af4c..3b9d205c36d 100644 --- a/cmake/QtPriHelpers.cmake +++ b/cmake/QtPriHelpers.cmake @@ -349,12 +349,18 @@ function(qt_generate_module_pri_file target) set(framework_base_path "$$QT_MODULE_LIB_BASE") set(public_module_includes "${framework_base_path}/${fw_header_dir}") 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}") else() set(public_module_includes "$$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/${module}") 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}") endif()