diff options
| author |  Drew DeVault <sir@cmpwn.com> | 2015-11-25 08:19:34 -0500 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2015-11-25 08:19:34 -0500 |
| commit | 402c9f4bf0fab1228b757990b292eb7b83690dd6 (patch) | |
| tree | 6f6545c296c3dcc086890de0e0459d533bbed1f1 | |
| parent | Merge pull request #257 from christophgysin/missing-include (diff) | |
| parent | cmake: fix ninja build (diff) | |
| download | sway-402c9f4bf0fab1228b757990b292eb7b83690dd6.tar.gz sway-402c9f4bf0fab1228b757990b292eb7b83690dd6.tar.zst sway-402c9f4bf0fab1228b757990b292eb7b83690dd6.zip | |
Merge pull request #255 from christophgysin/ninja
cmake: fix ninja build
| -rw-r--r-- | CMake/Wayland.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CMake/Wayland.cmake b/CMake/Wayland.cmake index 6647c5ee..f9349667 100644 --- a/CMake/Wayland.cmake +++ b/CMake/Wayland.cmake | |||
| @@ -40,7 +40,7 @@ function(WAYLAND_ADD_PROTOCOL_CLIENT _sources _protocol _basename) | |||
| 40 | 40 | ||
| 41 | get_filename_component(_infile ${_protocol} ABSOLUTE) | 41 | get_filename_component(_infile ${_protocol} ABSOLUTE) |
| 42 | set(_client_header "${CMAKE_CURRENT_BINARY_DIR}/wayland-${_basename}-client-protocol.h") | 42 | set(_client_header "${CMAKE_CURRENT_BINARY_DIR}/wayland-${_basename}-client-protocol.h") |
| 43 | set(_code "${CMAKE_CURRENT_BINARY_DIR}/wayland-${_basename}-protocol.c") | 43 | set(_code "${CMAKE_CURRENT_BINARY_DIR}/wayland-${_basename}-client-protocol.c") |
| 44 | 44 | ||
| 45 | add_custom_command(OUTPUT "${_client_header}" | 45 | add_custom_command(OUTPUT "${_client_header}" |
| 46 | COMMAND ${WAYLAND_SCANNER_EXECUTABLE} client-header < ${_infile} > ${_client_header} | 46 | COMMAND ${WAYLAND_SCANNER_EXECUTABLE} client-header < ${_infile} > ${_client_header} |
| @@ -62,7 +62,7 @@ function(WAYLAND_ADD_PROTOCOL_SERVER _sources _protocol _basename) | |||
| 62 | 62 | ||
| 63 | get_filename_component(_infile ${_protocol} ABSOLUTE) | 63 | get_filename_component(_infile ${_protocol} ABSOLUTE) |
| 64 | set(_server_header "${CMAKE_CURRENT_BINARY_DIR}/wayland-${_basename}-server-protocol.h") | 64 | set(_server_header "${CMAKE_CURRENT_BINARY_DIR}/wayland-${_basename}-server-protocol.h") |
| 65 | set(_code "${CMAKE_CURRENT_BINARY_DIR}/wayland-${_basename}-protocol.c") | 65 | set(_code "${CMAKE_CURRENT_BINARY_DIR}/wayland-${_basename}-server-protocol.c") |
| 66 | 66 | ||
| 67 | add_custom_command(OUTPUT "${_server_header}" | 67 | add_custom_command(OUTPUT "${_server_header}" |
| 68 | COMMAND ${WAYLAND_SCANNER_EXECUTABLE} server-header < ${_infile} > ${_server_header} | 68 | COMMAND ${WAYLAND_SCANNER_EXECUTABLE} server-header < ${_infile} > ${_server_header} |