From 50a228fc2d0250bcbbb35c676285831a0c35397e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Fri, 14 Jan 2022 15:41:27 +0100 Subject: [PATCH] Use AUTOMOC for generated sources instead of a specific rule. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- .../network-manager/dbus-introspection/CMakeLists.txt | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/tdecore/tdehw/networkbackends/network-manager/dbus-introspection/CMakeLists.txt b/tdecore/tdehw/networkbackends/network-manager/dbus-introspection/CMakeLists.txt index c420c5e75..db3beef98 100644 --- a/tdecore/tdehw/networkbackends/network-manager/dbus-introspection/CMakeLists.txt +++ b/tdecore/tdehw/networkbackends/network-manager/dbus-introspection/CMakeLists.txt @@ -32,13 +32,6 @@ function( add_dbus_xml option basename classname namespace xmlfile ) add_custom_command( OUTPUT ${basename}.cpp ${basename}.h COMMAND ${DBUSXML2QT3_EXECUTABLE} -${option} ${basename} ${classname} -N ${namespace} ${INTROSPECTIONPATH}/${xmlfile} 2>/dev/null DEPENDS ${INTROSPECTIONPATH}/${xmlfile} ) - if( "${option}" STREQUAL "p" ) - add_custom_command( OUTPUT ${basename}.moc - COMMAND ${TMOC_EXECUTABLE} ${basename}.h -o ${basename}.moc - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${basename}.h ) - set_property( SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${basename}.cpp APPEND - PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${basename}.moc ) - endif( ) endfunction( ) add_dbus_xml( p networkmanagerproxy NetworkManagerProxy DBus nm-manager.xml ) @@ -61,7 +54,7 @@ add_dbus_xml( p connectionsettings ConnectionSettingsInterface DBus nm-settings- # build the library -tde_add_library( tdenm_dbus STATIC_PIC +tde_add_library( tdenm_dbus STATIC_PIC AUTOMOC SOURCES networkmanagerproxy.cpp networkmanagerpppproxy.cpp deviceproxy.cpp bluetoothproxy.cpp olpcmeshproxy.cpp ethernetproxy.cpp