1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add dependencies of wayland protocols

Browse Source 
Some macros are missing DEPENDS for add_custom_commands

Fixes: QTBUG-108142
Change-Id: Ifacb2ea9bf3003c10dd407a8c77fc06b893b6a65
Reviewed-by: David Edmundson <davidedmundson@kde.org>
This commit is contained in:
Inho Lee 2022-11-03 13:12:45 +01:00
parent 9c5b09ee8d
commit 8826dbb613
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tools/qtwaylandscanner/Qt6WaylandClientMacros.cmake
View File

@ -38,11 +38,13 @@ function(qt6_generate_wayland_protocol_client_sources target)
OUTPUT "${waylandscanner_header_output}" OUTPUT "${waylandscanner_header_output}"
#TODO: Maybe put the files in ${CMAKE_CURRENT_BINARY_DIR/wayland_generated instead? #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}" COMMAND Wayland::Scanner --strict ${waylandscanner_extra_args} client-header < "${protocol_file}" > "${waylandscanner_header_output}"
DEPENDS ${protocol_file} Wayland::Scanner
) )
add_custom_command( add_custom_command(
OUTPUT "${waylandscanner_code_output}" OUTPUT "${waylandscanner_code_output}"
COMMAND Wayland::Scanner --strict ${waylandscanner_extra_args} public-code < "${protocol_file}" > "${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 "") set(wayland_include_dir "")

4
src/tools/qtwaylandscanner/Qt6WaylandCompositorMacros.cmake
View File

@ -34,10 +34,12 @@ function(qt6_generate_wayland_protocol_server_sources target)
OUTPUT "${waylandscanner_header_output}" OUTPUT "${waylandscanner_header_output}"
#TODO: Maybe put the files in ${CMAKE_CURRENT_BINARY_DIR/wayland_generated instead? #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}" COMMAND Wayland::Scanner --strict --include-core-only server-header < "${protocol_file}" > "${waylandscanner_header_output}"
DEPENDS ${protocol_file} Wayland::Scanner
) )
add_custom_command( add_custom_command(
OUTPUT "${waylandscanner_code_output}" OUTPUT "${waylandscanner_code_output}"
COMMAND Wayland::Scanner --strict --include-core-only public-code < "${protocol_file}" > "${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 "") set(wayland_include_dir "")
@ -60,6 +62,7 @@ function(qt6_generate_wayland_protocol_server_sources target)
--build-macro=${build_macro} --build-macro=${build_macro}
--header-path='${wayland_include_dir}' --header-path='${wayland_include_dir}'
> "${qtwaylandscanner_header_output}" > "${qtwaylandscanner_header_output}"
DEPENDS ${protocol_file} Qt6::qtwaylandscanner
) )
add_custom_command( add_custom_command(
@ -69,6 +72,7 @@ function(qt6_generate_wayland_protocol_server_sources target)
--build-macro=${build_macro} --build-macro=${build_macro}
--header-path='${wayland_include_dir}' --header-path='${wayland_include_dir}'
> "${qtwaylandscanner_code_output}" > "${qtwaylandscanner_code_output}"
DEPENDS ${protocol_file} Qt6::qtwaylandscanner
) )
target_sources(${target} PRIVATE target_sources(${target} PRIVATE