diff options
| author |  Christoph Gysin <christoph.gysin@gmail.com> | 2015-11-25 14:10:02 +0200 |
|---|---|---|
| committer | Christoph Gysin <christoph.gysin@gmail.com> | 2015-11-25 14:39:14 +0200 |
| commit | 1b5e0020c3cd31a9ffa06f91cb9e49acd0722173 (patch) | |
| tree | 551c6ec8e564b190d97541402f1cb01fe0216743 /CMake | |
| parent | Merge pull request #253 from sce/add_sibling_handle_floating_alt1 (diff) | |
| download | sway-1b5e0020c3cd31a9ffa06f91cb9e49acd0722173.tar.gz sway-1b5e0020c3cd31a9ffa06f91cb9e49acd0722173.tar.zst sway-1b5e0020c3cd31a9ffa06f91cb9e49acd0722173.zip | |
cmake: fix ninja build
When using the ninja generator:
$ cmake -G Ninja <dir>
$ ninja -C <dir>
This commit fixes the warning:
ninja: warning: multiple rules generate bin/wayland-desktop-shell-protocol.c. builds involving this target will not be correct; continuing anyway [-w dupbuild=warn]
Diffstat (limited to 'CMake')
| -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 42f97b3b..c6015305 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} |