diff options
| author | Aleix Pol <aleixpol@kde.org> | 2019-03-29 04:14:04 +0100 |
|---|---|---|
| committer | Aleix Pol <aleixpol@kde.org> | 2019-03-29 13:32:19 +0100 |
| commit | 6b27bbf0b954fe68c1611be3a5ca146e3e3c859a (patch) | |
| tree | 07944890329b93f1afdc2638ab9e8928ed6d37e9 /find-modules | |
| parent | ac807c4adc3e2854a59a7d2a507a2dabd1abbfa6 (diff) | |
| download | extra-cmake-modules-6b27bbf0b954fe68c1611be3a5ca146e3e3c859a.tar.gz extra-cmake-modules-6b27bbf0b954fe68c1611be3a5ca146e3e3c859a.tar.bz2 | |
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
Diffstat (limited to 'find-modules')
| -rw-r--r-- | find-modules/FindWaylandScanner.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
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}") |