sway

commit 1b5e0020c3cd31a9ffa06f91cb9e49acd0722173
parent a642827dfbf68de07c625e7c127efefaa9ac1ae1
Author: Christoph Gysin <christoph.gysin@gmail.com>
Date:   Wed, 25 Nov 2015 14:10:02 +0200

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:
M
CMake/Wayland.cmake
 | 
4
++--

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/CMake/Wayland.cmake b/CMake/Wayland.cmake
@@ -40,7 +40,7 @@ function(WAYLAND_ADD_PROTOCOL_CLIENT _sources _protocol _basename)
 
     get_filename_component(_infile ${_protocol} ABSOLUTE)
     set(_client_header "${CMAKE_CURRENT_BINARY_DIR}/wayland-${_basename}-client-protocol.h")
-    set(_code "${CMAKE_CURRENT_BINARY_DIR}/wayland-${_basename}-protocol.c")
+    set(_code "${CMAKE_CURRENT_BINARY_DIR}/wayland-${_basename}-client-protocol.c")
 
     add_custom_command(OUTPUT "${_client_header}"
         COMMAND ${WAYLAND_SCANNER_EXECUTABLE} client-header < ${_infile} > ${_client_header}
@@ -62,7 +62,7 @@ function(WAYLAND_ADD_PROTOCOL_SERVER _sources _protocol _basename)
 
     get_filename_component(_infile ${_protocol} ABSOLUTE)
     set(_server_header "${CMAKE_CURRENT_BINARY_DIR}/wayland-${_basename}-server-protocol.h")
-    set(_code "${CMAKE_CURRENT_BINARY_DIR}/wayland-${_basename}-protocol.c")
+    set(_code "${CMAKE_CURRENT_BINARY_DIR}/wayland-${_basename}-server-protocol.c")
 
     add_custom_command(OUTPUT "${_server_header}"
         COMMAND ${WAYLAND_SCANNER_EXECUTABLE} server-header < ${_infile} > ${_server_header}