From 67d48807b44735a2385b88db7ada01f7cd7eacfd Mon Sep 17 00:00:00 2001 From: Rolf Eike Beer Date: Thu, 22 Mar 2018 09:23:17 +0100 Subject: 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 Reviewed-by: David Faure --- src/scxml/Qt5ScxmlMacros.cmake | 1 + 1 file changed, 1 insertion(+) 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() -- cgit v1.2.3