whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use module-specific names for 'module_headers[_generated]' files 

Fix the syncqt issue when two modules are created in the same
CMakeLists.txt and share the build directory. In this case the
second module in the dependency chain rewrites
'module_headers[_generated]' files, so syncqt is not able to
proccess these files correctly.

Amends b89d63515b

Task-number: QTBUG-87480
Change-Id: Ibdcb66e96bdaabadc1c51611f5ed4a637d2f797f
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
bb10
Alexey Edelev 2022-11-09 12:36:52 +01:00
parent baa1228b43
commit 60b5ca5a23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/QtSyncQtHelpers.cmake
View File

@ -340,11 +340,11 @@ function(qt_internal_target_sync_headers target module_headers module_headers_ge
list(FILTER module_headers EXCLUDE REGEX
"(.+/(ui_)[^/]+\\.h|${CMAKE_CURRENT_SOURCE_DIR}(/.+)?/doc/+\\.h)")
set(module_headers_rsp "${binary_dir_real}/module_headers")
set(module_headers_rsp "${binary_dir_real}/${target}_module_headers")
list(JOIN module_headers "\n" module_headers_string)
qt_configure_file_v2(OUTPUT "${module_headers_rsp}" CONTENT "${module_headers_string}")
set(module_headers_generated_rsp "${binary_dir_real}/module_headers_generated")
set(module_headers_generated_rsp "${binary_dir_real}/${target}_module_headers_generated")
list(JOIN module_headers_generated "\n" module_headers_generated_string)
qt_configure_file_v2(OUTPUT "${module_headers_generated_rsp}" CONTENT
"${module_headers_generated_string}")