7090a9367d
1 OBS-URL: https://build.opensuse.org/request/show/525883 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtbase?expand=0&rev=66
42 lines
1.6 KiB
Diff
42 lines
1.6 KiB
Diff
From f7aaff01de9d5555e333cedcbbc07236cd653d0a Mon Sep 17 00:00:00 2001
|
|
From: David Faure <david.faure@kdab.com>
|
|
Date: Sun, 2 Jul 2017 18:10:39 +0200
|
|
Subject: [PATCH] Fix Qt5DBusMacros.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.
|
|
|
|
Change-Id: Iabd387832cfc74809fc5e6ff4782f4fc83cc07d8
|
|
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|
Reviewed-by: Rolf Eike Beer <eb@emlix.com>
|
|
Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
|
|
Reviewed-by: Stephen Kelly <steveire@gmail.com>
|
|
---
|
|
src/dbus/Qt5DBusMacros.cmake | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/src/dbus/Qt5DBusMacros.cmake b/src/dbus/Qt5DBusMacros.cmake
|
|
index ef3eb73276..0bd7364637 100644
|
|
--- a/src/dbus/Qt5DBusMacros.cmake
|
|
+++ b/src/dbus/Qt5DBusMacros.cmake
|
|
@@ -62,6 +62,7 @@ function(QT5_ADD_DBUS_INTERFACE _sources _interface _basename)
|
|
DEPENDS ${_infile} VERBATIM)
|
|
|
|
set_source_files_properties("${_impl}" PROPERTIES SKIP_AUTOMOC TRUE)
|
|
+ set_source_files_properties("${_header}" PROPERTIES SKIP_AUTOMOC TRUE)
|
|
|
|
qt5_generate_moc("${_header}" "${_moc}")
|
|
|
|
@@ -147,6 +148,7 @@ function(QT5_ADD_DBUS_ADAPTOR _sources _xml_file _include _parentClass) # _optio
|
|
|
|
qt5_generate_moc("${_header}" "${_moc}")
|
|
set_source_files_properties("${_impl}" PROPERTIES SKIP_AUTOMOC TRUE)
|
|
+ set_source_files_properties("${_header}" PROPERTIES SKIP_AUTOMOC TRUE)
|
|
macro_add_file_dependencies("${_impl}" "${_moc}")
|
|
|
|
list(APPEND ${_sources} "${_impl}" "${_header}" "${_moc}")
|
|
--
|
|
2.14.1
|
|
|