diff options
| author | Aleix Pol <aleixpol@kde.org> | 2020-11-18 16:09:47 +0100 |
|---|---|---|
| committer | Aleix Pol <aleixpol@kde.org> | 2020-11-18 16:17:36 +0100 |
| commit | 12e0189931fc47378b0330e0b910d3fdf9132442 (patch) | |
| tree | e3f83c68ecda0740a438ff9401ec975bcc1d7491 /find-modules | |
| parent | b9d0276c0f605c950cc739eafbdad9cc3f4ece6a (diff) | |
| download | extra-cmake-modules-12e0189931fc47378b0330e0b910d3fdf9132442.tar.gz extra-cmake-modules-12e0189931fc47378b0330e0b910d3fdf9132442.tar.bz2 | |
(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.
Diffstat (limited to 'find-modules')
| -rw-r--r-- | find-modules/FindQtWaylandScanner.cmake | 4 | ||||
| -rw-r--r-- | find-modules/FindWaylandScanner.cmake | 3 |
2 files changed, 3 insertions, 4 deletions
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) diff --git a/find-modules/FindWaylandScanner.cmake b/find-modules/FindWaylandScanner.cmake index 61b4875e..08b0650b 100644 --- a/find-modules/FindWaylandScanner.cmake +++ b/find-modules/FindWaylandScanner.cmake @@ -134,7 +134,8 @@ function(ecm_add_wayland_server_protocol out_var) get_filename_component(_infile ${ARGS_PROTOCOL} ABSOLUTE) set(_server_header "${CMAKE_CURRENT_BINARY_DIR}/wayland-${ARGS_BASENAME}-server-protocol.h") - set_property(SOURCE ${_server_header} PROPERTY SKIP_AUTOMOC ON) + set(_server_code "${CMAKE_CURRENT_BINARY_DIR}/wayland-${ARGS_BASENAME}-protocol.c") + set_property(SOURCE ${_server_header} ${_server_code} PROPERTY SKIP_AUTOMOC ON) set_source_files_properties(${_server_header} GENERATED) add_custom_command(OUTPUT "${_server_header}" |