diff options
| author | Rolf Eike Beer <eb@emlix.com> | 2018-03-22 09:23:17 +0100 |
|---|---|---|
| committer | Rolf Eike Beer <eb@emlix.com> | 2018-03-23 11:52:09 +0000 |
| commit | 67d48807b44735a2385b88db7ada01f7cd7eacfd (patch) | |
| tree | a716a9b66551adda00f912bd11d53ea8284aa667 | |
| parent | 4b4f052e679a1dc2b578ed140e54fd7a96f1050b (diff) | |
Fix Qt5ScxmlMacros.cmake for CMake 3.9v5.11.0-beta4v5.11.0-beta3
CMake gained support for running AUTOMOC on generated headers, so we
need to mark them with SKIP_AUTOMOC since we're generating moc files
for those already. Otherwise we get duplicated symbols.
The same change has already been done for generated DBus files, but it
is needed here, too.
Change-Id: I48a998bc1769478d34d8f30f0e849cd91bc1f785
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: David Faure <david.faure@kdab.com>
| -rw-r--r-- | src/scxml/Qt5ScxmlMacros.cmake | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/scxml/Qt5ScxmlMacros.cmake b/src/scxml/Qt5ScxmlMacros.cmake index 234258c..c4454ec 100644 --- a/src/scxml/Qt5ScxmlMacros.cmake +++ b/src/scxml/Qt5ScxmlMacros.cmake @@ -63,5 +63,6 @@ function(qt5_add_statecharts outfiles) VERBATIM) list(APPEND ${outfiles} ${outfile_cpp}) endforeach() + set_source_files_properties(${outfiles} PROPERTIES SKIP_AUTOMOC TRUE) set(${outfiles} ${${outfiles}} PARENT_SCOPE) endfunction() |