diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-08 15:11:07 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-02-13 08:48:22 +0000 |
| commit | 7be7e387207db0b59f60a1fe8a109fedb32efb29 (patch) | |
| tree | 7f9f1275296b58abad587d73d43e491d9107f8b3 | |
| parent | 6c4f89e047b933e53c50bcd56ba738c34b753f8e (diff) | |
| download | qtwayland-7be7e387207db0b59f60a1fe8a109fedb32efb29.tar.gz | |
Exclude sources generated by the scanner from CMake Unity (Jumbo) builds
The generated helper function wlRegistryBind() clashes.
Task-number: QTBUG-109394
Change-Id: Ib814d4576c7565b0413ca16bc0bf5e95caa92c33
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
(cherry picked from commit f5445e74b54d96ca215f5c8b01874174a4efbd9f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/client/Qt6WaylandClientMacros.cmake | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/client/Qt6WaylandClientMacros.cmake b/src/client/Qt6WaylandClientMacros.cmake index 9fcec57d..c7ac0852 100644 --- a/src/client/Qt6WaylandClientMacros.cmake +++ b/src/client/Qt6WaylandClientMacros.cmake @@ -86,12 +86,14 @@ function(qt6_generate_wayland_protocol_client_sources target) DEPENDS ${protocol_file} Qt6::qtwaylandscanner ) - target_sources(${target} PRIVATE - "${waylandscanner_header_output}" + set(sources "${waylandscanner_header_output}" "${waylandscanner_code_output}" "${qtwaylandscanner_header_output}" - "${qtwaylandscanner_code_output}" - ) + "${qtwaylandscanner_code_output}") + + target_sources(${target} PRIVATE ${sources}) + + set_source_files_properties(${sources} PROPERTIES SKIP_UNITY_BUILD_INCLUSION ON) endforeach() target_include_directories(${target} PRIVATE ${target_binary_dir}) endfunction() |