From a61b4733b63f469c38685691e1fb3cff7e90a3b3 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 6 Aug 2026 22:57:25 +0200
Subject: [PATCH] Add reusable wx_generate_wayland_protocol() CMake function

Use it for the only Wayland protocol file used so far.

Also combine the commands which can run concurrently into a single
execute_process() call as it looks like it could be more efficient (and
it's definitely less verbose).
---
 build/cmake/init.cmake | 52 +++++++++++++++++++++---------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake
index 44dc16f977..3cc4897734 100644
--- a/build/cmake/init.cmake
+++ b/build/cmake/init.cmake
@@ -471,37 +471,37 @@ if(wxUSE_GUI)
                         set(wx_protocols_temp_dir ${wxOUTPUT_DIR}/wx/protocols)
                         set(wx_protocols_output_dir ${wxSETUP_HEADER_PATH}/wx/protocols)
 
-                        # Note that we need multiple execute_process()
-                        # invocations as single one would run commands
-                        # concurrently and not sequentially.
                         execute_process(
                             COMMAND
-                                ${CMAKE_COMMAND} -E make_directory ${wx_protocols_temp_dir}
-                        )
-                        execute_process(
-                            COMMAND
-                                ${WAYLAND_SCANNER} client-header
-                                    ${wx_protocols_input_dir}/pointer-warp-v1.xml
-                                    ${wx_protocols_temp_dir}/pointer-warp-v1-client-protocol.h
-                        )
-                        execute_process(
-                            COMMAND
-                                ${WAYLAND_SCANNER} private-code
-                                    ${wx_protocols_input_dir}/pointer-warp-v1.xml
-                                    ${wx_protocols_temp_dir}/pointer-warp-v1-client-protocol.c
-                        )
-
-                        execute_process(
-                            COMMAND
-                                ${CMAKE_COMMAND} -E make_directory ${wx_protocols_output_dir}
-                        )
-                        execute_process(
-                            COMMAND ${CMAKE_COMMAND} -E copy_if_different
-                                    ${wx_protocols_temp_dir}/pointer-warp-v1-client-protocol.h
-                                    ${wx_protocols_temp_dir}/pointer-warp-v1-client-protocol.c
+                                ${CMAKE_COMMAND} -E make_directory
+                                    ${wx_protocols_temp_dir}
                                     ${wx_protocols_output_dir}
                         )
 
+                        # This function takes the protocol name and the directory
+                        # containing the corresponding XML file.
+                        function(wx_generate_wayland_protocol protocol_dir protocol)
+                            execute_process(
+                                COMMAND
+                                    ${WAYLAND_SCANNER} client-header
+                                        ${protocol_dir}/${protocol}.xml
+                                        ${wx_protocols_temp_dir}/${protocol}-client-protocol.h
+                                COMMAND
+                                    ${WAYLAND_SCANNER} private-code
+                                        ${protocol_dir}/${protocol}.xml
+                                        ${wx_protocols_temp_dir}/${protocol}-client-protocol.c
+                            )
+
+                            execute_process(
+                                COMMAND ${CMAKE_COMMAND} -E copy_if_different
+                                        ${wx_protocols_temp_dir}/${protocol}-client-protocol.h
+                                        ${wx_protocols_temp_dir}/${protocol}-client-protocol.c
+                                        ${wx_protocols_output_dir}
+                            )
+                        endfunction()
+
+                        wx_generate_wayland_protocol(${wx_protocols_input_dir} pointer-warp-v1)
+
                         set(wxHAVE_WAYLAND_CLIENT ON)
                         list(APPEND wxTOOLKIT_INCLUDE_DIRS ${WAYLAND_CLIENT_INCLUDE_DIRS})
                         list(APPEND wxTOOLKIT_LIBRARIES ${WAYLAND_CLIENT_LIBRARIES})