diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2022-11-09 12:36:52 +0100 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2022-11-10 19:29:52 +0100 |
| commit | 60b5ca5a23814ea32b1e8560f3806b8c48fb1f94 (patch) | |
| tree | 98731d931d8c991c74552430d0d41751b3ccfd2f /cmake | |
| parent | baa1228b4348ef70d525165062eef8ee37919433 (diff) | |
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 b89d63515bb352cecfd87e709320a2db5b6a1906
Task-number: QTBUG-87480
Change-Id: Ibdcb66e96bdaabadc1c51611f5ed4a637d2f797f
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtSyncQtHelpers.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/QtSyncQtHelpers.cmake b/cmake/QtSyncQtHelpers.cmake index b434a0beaa..857f0509ae 100644 --- a/cmake/QtSyncQtHelpers.cmake +++ b/cmake/QtSyncQtHelpers.cmake @@ -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}") |