Mirrors_UI_SDK/wxWidgets
1
0
Fork 0
mirror of https://github.com/wxWidgets/wxWidgets.git synced 2026-08-17 08:53:06 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Add reusable wx_generate_wayland_protocol() CMake function

Browse Source 
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).
This commit is contained in:
Vadim Zeitlin
2026-08-06 22:57:25 +02:00
parent 84ca3b7b5b
commit a61b4733b6
1 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/cmake/init.cmake
+26 -26
View File
@@ -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})