From 8826dbb61348ea2dfa8bfe7dac0e2b82d47a5698 Mon Sep 17 00:00:00 2001
From: Inho Lee <inho.lee@qt.io>
Date: Thu, 3 Nov 2022 13:12:45 +0100
Subject: [PATCH] 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>
---
 src/tools/qtwaylandscanner/Qt6WaylandClientMacros.cmake     | 2 ++
 src/tools/qtwaylandscanner/Qt6WaylandCompositorMacros.cmake | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/src/tools/qtwaylandscanner/Qt6WaylandClientMacros.cmake b/src/tools/qtwaylandscanner/Qt6WaylandClientMacros.cmake
index ea0ac323f8e..9fcec57d230 100644
--- a/src/tools/qtwaylandscanner/Qt6WaylandClientMacros.cmake
+++ b/src/tools/qtwaylandscanner/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/tools/qtwaylandscanner/Qt6WaylandCompositorMacros.cmake b/src/tools/qtwaylandscanner/Qt6WaylandCompositorMacros.cmake
index cce2073ca1c..3221f815b72 100644
--- a/src/tools/qtwaylandscanner/Qt6WaylandCompositorMacros.cmake
+++ b/src/tools/qtwaylandscanner/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