summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2019-05-02 14:36:17 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2019-05-02 14:36:17 +0900
commitdadafca88037390b0e833d904ae5b80f5b9b4061 (patch)
treea2a6f293fd8cc2a7fd98dd13fab83d672c08a42e
parent0e7f9b8db10ef4c4fbc414bf2c6d804265c54ca4 (diff)
downloadtdelibs-dadafca88037390b0e833d904ae5b80f5b9b4061.zip
tdelibs-dadafca88037390b0e833d904ae5b80f5b9b4061.tar.gz
Fixed moc inclusion after last changes in dbus-1-tqt.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz> Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rw-r--r--tdecore/tdehw/networkbackends/network-manager/dbus-introspection/CMakeLists.txt19
1 files changed, 8 insertions, 11 deletions
diff --git a/tdecore/tdehw/networkbackends/network-manager/dbus-introspection/CMakeLists.txt b/tdecore/tdehw/networkbackends/network-manager/dbus-introspection/CMakeLists.txt
index 8efdd60..c420c5e 100644
--- a/tdecore/tdehw/networkbackends/network-manager/dbus-introspection/CMakeLists.txt
+++ b/tdecore/tdehw/networkbackends/network-manager/dbus-introspection/CMakeLists.txt
@@ -32,6 +32,13 @@ 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 )
@@ -52,16 +59,6 @@ add_dbus_xml( p networkmanagersettings SettingsInterface DBus nm-settings.xml )
add_dbus_xml( p connectionsettings ConnectionSettingsInterface DBus nm-settings-connection.xml )
-# generate moc files
-
-set( MOCHEADERS accesspointproxy.h deviceproxy.h networkmanagerproxy.h networkmanagerpppproxy.h bluetoothproxy.h olpcmeshproxy.h ethernetproxy.h
- infinibandproxy.h wifiproxy.h wimaxproxy.h activeconnectionproxy.h vpnconnectionproxy.h vpnpluginproxy.h modemproxy.h
- networkmanagersettings.h connectionsettings.h )
-
-foreach( _header_file ${MOCHEADERS} )
- tde_moc( MOCSOURCES ${CMAKE_CURRENT_BINARY_DIR}/${_header_file} )
-endforeach( )
-
# build the library
tde_add_library( tdenm_dbus STATIC_PIC
@@ -71,5 +68,5 @@ tde_add_library( tdenm_dbus STATIC_PIC
infinibandproxy.cpp wifiproxy.cpp wimaxproxy.cpp accesspointproxy.cpp
networkmanagersettings.cpp connectionsettings.cpp
activeconnectionproxy.cpp vpnconnectionproxy.cpp
- vpnpluginproxy.cpp modemproxy.cpp ${MOCSOURCES}
+ vpnpluginproxy.cpp modemproxy.cpp
)