From 6b27bbf0b954fe68c1611be3a5ca146e3e3c859a Mon Sep 17 00:00:00 2001 From: Aleix Pol Date: Fri, 29 Mar 2019 04:14:04 +0100 Subject: ecm_add_wayland_client_protocol: Improve error messages Summary: Instead of passing the data from stdin, pass the path, this way if there's an error wayland-scanner will be able to tell us the file and line where it's failing. Test Plan: Built kwayland and kwin with it Reviewers: #kwin, #frameworks, zzag Reviewed By: #kwin, zzag Subscribers: kde-frameworks-devel, kde-buildsystem Tags: #frameworks, #build_system Differential Revision: https://phabricator.kde.org/D20105 --- find-modules/FindWaylandScanner.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'find-modules/FindWaylandScanner.cmake') diff --git a/find-modules/FindWaylandScanner.cmake b/find-modules/FindWaylandScanner.cmake index 361915f4..ed9c4c4c 100644 --- a/find-modules/FindWaylandScanner.cmake +++ b/find-modules/FindWaylandScanner.cmake @@ -128,11 +128,11 @@ function(ecm_add_wayland_client_protocol out_var) set_property(SOURCE ${_client_header} PROPERTY SKIP_AUTOMOC ON) add_custom_command(OUTPUT "${_client_header}" - COMMAND ${WaylandScanner_EXECUTABLE} client-header < ${_infile} > ${_client_header} + COMMAND ${WaylandScanner_EXECUTABLE} client-header ${_infile} ${_client_header} DEPENDS ${_infile} VERBATIM) add_custom_command(OUTPUT "${_code}" - COMMAND ${WaylandScanner_EXECUTABLE} code < ${_infile} > ${_code} + COMMAND ${WaylandScanner_EXECUTABLE} code ${_infile} ${_code} DEPENDS ${_infile} ${_client_header} VERBATIM) list(APPEND ${out_var} "${_client_header}" "${_code}") @@ -159,7 +159,7 @@ function(ecm_add_wayland_server_protocol out_var) set_source_files_properties(${_server_header} GENERATED) add_custom_command(OUTPUT "${_server_header}" - COMMAND ${WaylandScanner_EXECUTABLE} server-header < ${_infile} > ${_server_header} + COMMAND ${WaylandScanner_EXECUTABLE} server-header ${_infile} ${_server_header} DEPENDS ${_infile} VERBATIM) list(APPEND ${out_var} "${_server_header}") -- cgit v1.2.1