diff options
| author | Kevin Funk <kevin.funk@kdab.com> | 2020-09-21 10:32:19 +0200 |
|---|---|---|
| committer | Kevin Funk <kevin.funk@kdab.com> | 2020-09-22 12:56:26 +0200 |
| commit | 7b46690801f282a850b872b434292289fb045e61 (patch) | |
| tree | dea61ad86b2d14babc5678c7df23039c7314b6e5 /src/dbus | |
| parent | dfd2dbcda509835014dd9091884bf6ae62cb83b3 (diff) | |
dbus: Skip AUTOUIC on generated sources
Skip AUTOUIC on sources generated by the qt_add_dbus_interface and
qt_add_dbus_adaptor macros. Otherwise CMake will warn due to policy
CMP0071:
```
For compatibility, CMake is excluding the GENERATED source file(s):
(...)
from processing by AUTOMOC and AUTOUIC. (...)
```
Change-Id: I7d14b23c9343940964d5bc0d1d18fc19b41b5cd0
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit e59e924f529fbebfe4572be1b818f262bbf20c2d)
Diffstat (limited to 'src/dbus')
| -rw-r--r-- | src/dbus/Qt5DBusMacros.cmake | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/dbus/Qt5DBusMacros.cmake b/src/dbus/Qt5DBusMacros.cmake index 1cacccdddd..46ae429b61 100644 --- a/src/dbus/Qt5DBusMacros.cmake +++ b/src/dbus/Qt5DBusMacros.cmake @@ -61,7 +61,10 @@ function(qt5_add_dbus_interface _sources _interface _basename) COMMAND ${Qt5DBus_QDBUSXML2CPP_EXECUTABLE} ${_params} -p ${_basename} ${_infile} DEPENDS ${_infile} VERBATIM) - set_source_files_properties("${_impl}" "${_header}" PROPERTIES SKIP_AUTOMOC TRUE) + set_source_files_properties("${_impl}" "${_header}" PROPERTIES + SKIP_AUTOMOC TRUE + SKIP_AUTOUIC TRUE + ) qt5_generate_moc("${_header}" "${_moc}") @@ -178,7 +181,10 @@ function(qt5_add_dbus_adaptor _sources _xml_file _include _parentClass) # _optio endif() qt5_generate_moc("${_header}" "${_moc}") - set_source_files_properties("${_impl}" "${_header}" PROPERTIES SKIP_AUTOMOC TRUE) + set_source_files_properties("${_impl}" "${_header}" PROPERTIES + SKIP_AUTOMOC TRUE + SKIP_AUTOUIC TRUE + ) macro_add_file_dependencies("${_impl}" "${_moc}") list(APPEND ${_sources} "${_impl}" "${_header}" "${_moc}") |