diff options
| author | Inho Lee <inho.lee@qt.io> | 2022-11-03 13:12:45 +0100 |
|---|---|---|
| committer | Inho Lee <inho.lee@qt.io> | 2022-11-07 17:48:08 +0100 |
| commit | 9fe46c91092857bf5eb61998b6a7a8c483e08683 (patch) | |
| tree | 3509367739cec3d38f2ca0e3c16eff26a9a5d310 /src | |
| parent | 5c5a417abbc686595f746879463a0c4cb46b3cbb (diff) | |
| download | qtwayland-9fe46c91092857bf5eb61998b6a7a8c483e08683.tar.gz | |
Add dependencies of wayland protocols
Some macros are missing DEPENDS for add_custom_commands
Fixes: QTBUG-108142
Change-Id: Ifacb2ea9bf3003c10dd407a8c77fc06b893b6a65
Reviewed-by: David Edmundson <davidedmundson@kde.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/Qt6WaylandClientMacros.cmake | 2 | ||||
| -rw-r--r-- | src/compositor/Qt6WaylandCompositorMacros.cmake | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/client/Qt6WaylandClientMacros.cmake b/src/client/Qt6WaylandClientMacros.cmake index ea0ac323..9fcec57d 100644 --- a/src/client/Qt6WaylandClientMacros.cmake +++ b/src/client/Qt6WaylandClientMacros.cmake @@ -38,11 +38,13 @@ function(qt6_generate_wayland_protocol_client_sources target) OUTPUT "${waylandscanner_header_output}" #TODO: Maybe put the files in ${CMAKE_CURRENT_BINARY_DIR/wayland_generated instead? COMMAND Wayland::Scanner --strict ${waylandscanner_extra_args} client-header < "${protocol_file}" > "${waylandscanner_header_output}" + DEPENDS ${protocol_file} Wayland::Scanner ) add_custom_command( OUTPUT "${waylandscanner_code_output}" COMMAND Wayland::Scanner --strict ${waylandscanner_extra_args} public-code < "${protocol_file}" > "${waylandscanner_code_output}" + DEPENDS ${protocol_file} Wayland::Scanner ) set(wayland_include_dir "") diff --git a/src/compositor/Qt6WaylandCompositorMacros.cmake b/src/compositor/Qt6WaylandCompositorMacros.cmake index cce2073c..3221f815 100644 --- a/src/compositor/Qt6WaylandCompositorMacros.cmake +++ b/src/compositor/Qt6WaylandCompositorMacros.cmake @@ -34,10 +34,12 @@ function(qt6_generate_wayland_protocol_server_sources target) OUTPUT "${waylandscanner_header_output}" #TODO: Maybe put the files in ${CMAKE_CURRENT_BINARY_DIR/wayland_generated instead? COMMAND Wayland::Scanner --strict --include-core-only server-header < "${protocol_file}" > "${waylandscanner_header_output}" + DEPENDS ${protocol_file} Wayland::Scanner ) add_custom_command( OUTPUT "${waylandscanner_code_output}" COMMAND Wayland::Scanner --strict --include-core-only public-code < "${protocol_file}" > "${waylandscanner_code_output}" + DEPENDS ${protocol_file} Wayland::Scanner ) set(wayland_include_dir "") @@ -60,6 +62,7 @@ function(qt6_generate_wayland_protocol_server_sources target) --build-macro=${build_macro} --header-path='${wayland_include_dir}' > "${qtwaylandscanner_header_output}" + DEPENDS ${protocol_file} Qt6::qtwaylandscanner ) add_custom_command( @@ -69,6 +72,7 @@ function(qt6_generate_wayland_protocol_server_sources target) --build-macro=${build_macro} --header-path='${wayland_include_dir}' > "${qtwaylandscanner_code_output}" + DEPENDS ${protocol_file} Qt6::qtwaylandscanner ) target_sources(${target} PRIVATE |