From 12e0189931fc47378b0330e0b910d3fdf9132442 Mon Sep 17 00:00:00 2001 From: Aleix Pol Date: Wed, 18 Nov 2020 16:09:47 +0100 Subject: (Qt)WaylandScanner: Properly mark files as SKIP_AUTOMOC Have the C counterpart take care of the C files and the C++ for the C++ files. Don't forget to skip the server C implementation. --- find-modules/FindQtWaylandScanner.cmake | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'find-modules/FindQtWaylandScanner.cmake') diff --git a/find-modules/FindQtWaylandScanner.cmake b/find-modules/FindQtWaylandScanner.cmake index 65da5d2e..efbbe87a 100644 --- a/find-modules/FindQtWaylandScanner.cmake +++ b/find-modules/FindQtWaylandScanner.cmake @@ -117,8 +117,6 @@ function(ecm_add_qtwayland_client_protocol out_var) BASENAME ${ARGS_BASENAME}) get_filename_component(_infile ${ARGS_PROTOCOL} ABSOLUTE) - set(_ccode "${CMAKE_CURRENT_BINARY_DIR}/wayland-${ARGS_BASENAME}-client-protocol.c") - set(_cheader "${CMAKE_CURRENT_BINARY_DIR}/wayland-${ARGS_BASENAME}-client-protocol.h") set(_header "${CMAKE_CURRENT_BINARY_DIR}/qwayland-${ARGS_BASENAME}.h") set(_code "${CMAKE_CURRENT_BINARY_DIR}/qwayland-${ARGS_BASENAME}.cpp") @@ -132,7 +130,7 @@ function(ecm_add_qtwayland_client_protocol out_var) COMMAND ${QtWaylandScanner_EXECUTABLE} client-code ${_infile} "" ${_prefix} > ${_code} DEPENDS ${_infile} ${_header} VERBATIM) - set_property(SOURCE ${_header} ${_code} ${_cheader} ${_ccode} PROPERTY SKIP_AUTOMOC ON) + set_property(SOURCE ${_header} ${_code} PROPERTY SKIP_AUTOMOC ON) list(APPEND ${out_var} "${_code}") set(${out_var} ${${out_var}} PARENT_SCOPE) -- cgit v1.2.1