summaryrefslogtreecommitdiffstats
path: root/tdecore/tdehw
diff options
context:
space:
mode:
authorAlexander Golubev <fatzer2@gmail.com>2013-08-11 02:38:50 +0400
committerAlexander Golubev <fatzer2@gmail.com>2013-08-11 02:38:50 +0400
commitfba175e1f902681b279b8a6895a787cd1a015e07 (patch)
tree23174f81051bcfba08c78c4c379eedd8a8d11c7e /tdecore/tdehw
parentb7ff6c33309224a4e598a0691e7cb2dc353a6ace (diff)
downloadtdelibs-fba175e1f902681b279b8a6895a787cd1a015e07.tar.gz
tdelibs-fba175e1f902681b279b8a6895a787cd1a015e07.zip
Change cmake to use general tde_moc macro rather than another reinventted wheel
Diffstat (limited to 'tdecore/tdehw')
-rw-r--r--tdecore/tdehw/networkbackends/network-manager/dbus-introspection/CMakeLists.txt21
1 files changed, 3 insertions, 18 deletions
diff --git a/tdecore/tdehw/networkbackends/network-manager/dbus-introspection/CMakeLists.txt b/tdecore/tdehw/networkbackends/network-manager/dbus-introspection/CMakeLists.txt
index 144d56569..8efdd6031 100644
--- a/tdecore/tdehw/networkbackends/network-manager/dbus-introspection/CMakeLists.txt
+++ b/tdecore/tdehw/networkbackends/network-manager/dbus-introspection/CMakeLists.txt
@@ -59,24 +59,9 @@ set( MOCHEADERS accesspointproxy.h deviceproxy.h networkmanagerproxy.h networkma
networkmanagersettings.h connectionsettings.h )
foreach( _header_file ${MOCHEADERS} )
- get_filename_component( _basename "${_header_file}" NAME_WE )
- set( _moc_file ${_basename}.moc )
- list( APPEND _moc_files ${_moc_file} )
- add_custom_command( OUTPUT ${_moc_file}
- COMMAND ${TMOC_EXECUTABLE} ${_header_file} -o ${_moc_file}
- DEPENDS ${_header_file} )
+ tde_moc( MOCSOURCES ${CMAKE_CURRENT_BINARY_DIR}/${_header_file} )
endforeach( )
-add_custom_command( OUTPUT mocfiles.cpp
- COMMAND cat ${_moc_files} > mocfiles.cpp
- DEPENDS ${_moc_files} )
-
-# tde_automoc( 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 )
-
# build the library
tde_add_library( tdenm_dbus STATIC_PIC
@@ -85,6 +70,6 @@ tde_add_library( tdenm_dbus STATIC_PIC
deviceproxy.cpp bluetoothproxy.cpp olpcmeshproxy.cpp ethernetproxy.cpp
infinibandproxy.cpp wifiproxy.cpp wimaxproxy.cpp accesspointproxy.cpp
networkmanagersettings.cpp connectionsettings.cpp
- mocfiles.cpp activeconnectionproxy.cpp vpnconnectionproxy.cpp
- vpnpluginproxy.cpp modemproxy.cpp
+ activeconnectionproxy.cpp vpnconnectionproxy.cpp
+ vpnpluginproxy.cpp modemproxy.cpp ${MOCSOURCES}
)