Skip to content

Improve cross building: Use packages mir_wayland_generator during cro… #4734

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
sunweaver wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Improve cross building: Use packages mir_wayland_generator during cro… #4734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions cmake/MirCommon.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,14 @@ function (mir_check_no_unreleased_symbols TARGET DEPENDENT_TARGET)
add_dependencies(${DEPENDENT_TARGET} ${TARGET_NAME})
endfunction()

set(
MIR_WAYLAND_GENERATOR_EXECUTABLE
"${CMAKE_BINARY_DIR}/bin/mir_wayland_generator"
CACHE
STRING
"Location of an externally supplied mir_wayland_generator executable"
)

function (mir_generate_protocol_wrapper TARGET_NAME NAME_PREFIX PROTOCOL_FILE)
if (NAME_PREFIX STREQUAL "")
set(NAME_PREFIX "@") # won't match anything
Expand All @@ -327,9 +335,9 @@ function (mir_generate_protocol_wrapper TARGET_NAME NAME_PREFIX PROTOCOL_FILE)
OUTPUT "${OUTPUT_PATH_HEADER}" "${OUTPUT_PATH_SRC}"
VERBATIM
COMMAND "sh" "-c"
"${CMAKE_BINARY_DIR}/bin/mir_wayland_generator ${NAME_PREFIX} ${PROTOCOL_PATH} header > ${OUTPUT_PATH_HEADER}"
"${MIR_WAYLAND_GENERATOR_EXECUTABLE} ${NAME_PREFIX} ${PROTOCOL_PATH} header > ${OUTPUT_PATH_HEADER}"
COMMAND "sh" "-c"
"${CMAKE_BINARY_DIR}/bin/mir_wayland_generator ${NAME_PREFIX} ${PROTOCOL_PATH} source > ${OUTPUT_PATH_SRC}"
"${MIR_WAYLAND_GENERATOR_EXECUTABLE} ${NAME_PREFIX} ${PROTOCOL_PATH} source > ${OUTPUT_PATH_SRC}"
DEPENDS mir_wayland_generator "${PROTOCOL_PATH}"
)
target_sources("${TARGET_NAME}" PRIVATE "${OUTPUT_PATH_HEADER}" "${OUTPUT_PATH_SRC}")
Expand Down
4 changes: 2 additions & 2 deletions tests/acceptance-tests/wayland-generator/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ add_custom_command(
OUTPUT "${GENERATED_HEADER}" "${GENERATED_SRC}"
VERBATIM
COMMAND "sh" "-c"
"${CMAKE_BINARY_DIR}/bin/mir_wayland_generator wl_ ${PROTOCOL_PATH} header > ${GENERATED_HEADER}"
"${MIR_WAYLAND_GENERATOR_EXECUTABLE} wl_ ${PROTOCOL_PATH} header > ${GENERATED_HEADER}"
COMMAND "sh" "-c"
"${CMAKE_BINARY_DIR}/bin/mir_wayland_generator wl_ ${PROTOCOL_PATH} source > ${GENERATED_SRC}"
"${MIR_WAYLAND_GENERATOR_EXECUTABLE} wl_ ${PROTOCOL_PATH} source > ${GENERATED_SRC}"
DEPENDS mir_wayland_generator "${PROTOCOL_PATH}"
)
add_custom_target(wayland_generator_test_generated_files ALL DEPENDS "${GENERATED_SRC}" "${GENERATED_HEADER}")
Expand Down