summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRolf Eike Beer <eb@emlix.com>2018-03-22 09:23:17 +0100
committerRolf Eike Beer <eb@emlix.com>2018-03-29 08:54:55 +0000
commit648b70aa2b8c52a04f1705f5225992239416a8f6 (patch)
tree42d6c55f26bcbdb1314c7a521e64e993f6bd31d1 /src
parentbadc34bef841042ce127de7db71df6a1d83a0d01 (diff)
Fix Qt5ScxmlMacros.cmake for CMake 3.9
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> (cherry picked from commit 67d48807b44735a2385b88db7ada01f7cd7eacfd) Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
Diffstat (limited to 'src')
-rw-r--r--src/scxml/Qt5ScxmlMacros.cmake1
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()