summaryrefslogtreecommitdiffstats
path: root/src/libtdeobex/interfaces
diff options
context:
space:
mode:
authorSlávek Banko <[email protected]>2023-03-07 01:47:18 +0100
committerSlávek Banko <[email protected]>2023-03-07 01:47:18 +0100
commit6740c7de32165717a85bd6fa69b35c93ae6499c0 (patch)
tree6a0d5c8473d85f58344a3dd4fa33b942a44333d6 /src/libtdeobex/interfaces
parentb8225d27fca0564fda7f39b37d0e84b2654d2e49 (diff)
downloadtdebluez-6740c7de32165717a85bd6fa69b35c93ae6499c0.tar.gz
tdebluez-6740c7de32165717a85bd6fa69b35c93ae6499c0.zip
Take advantage of automoc support for generated files.
Macro make_moc and its explicit calls is no longer needed. Signed-off-by: Slávek Banko <[email protected]>
Diffstat (limited to 'src/libtdeobex/interfaces')
-rw-r--r--src/libtdeobex/interfaces/CMakeLists.txt25
1 files changed, 3 insertions, 22 deletions
diff --git a/src/libtdeobex/interfaces/CMakeLists.txt b/src/libtdeobex/interfaces/CMakeLists.txt
index 60a9659..9c09e24 100644
--- a/src/libtdeobex/interfaces/CMakeLists.txt
+++ b/src/libtdeobex/interfaces/CMakeLists.txt
@@ -18,16 +18,6 @@ include_directories(
set( INTROSPECTIONPATH ${CMAKE_SOURCE_DIR}/src/interfaces )
set( DBUSXML2QT3_EXECUTABLE dbusxml2qt3 )
-function( make_moc fileinput )
- add_custom_command( OUTPUT ${fileinput}.moc
- COMMAND ${TMOC_EXECUTABLE} ${fileinput}.h -o ${fileinput}.moc
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${fileinput}.h
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- )
- set_property( SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${fileinput}.cpp APPEND
- PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${fileinput}.moc )
-endfunction( )
-
set( ObjectManager_HDRS objectmanagerInterface.h objectmanagerProxy.h introspectableInterface.h )
set( ObjectManager_SRCS objectmanagerInterface.cpp objectmanagerProxy.cpp introspectableInterface.cpp )
@@ -37,7 +27,7 @@ set (Agent_SRCS agent1Interface.cpp agent1Proxy.cpp dbusbaseNode.cpp tdeobexNode
set (Client_HDRS agentmanager1Interface.h agentmanager1Proxy.h client1Interface.h client1Proxy.h filetransfer1Interface.h filetransfer1Proxy.h obexNode.h objectpush1Interface.h objectpush1Proxy.h phonebookaccess1Interface.h phonebookaccess1Proxy.h session1Interface.h session1Proxy.h synchronization1Interface.h synchronization1Proxy.h transfer1Interface.h transfer1Proxy.h)
set (Client_SRCS agentmanager1Interface.cpp agentmanager1Proxy.cpp client1Interface.cpp client1Proxy.cpp filetransfer1Interface.cpp filetransfer1Proxy.cpp obexNode.cpp objectpush1Interface.cpp objectpush1Proxy.cpp phonebookaccess1Interface.cpp phonebookaccess1Proxy.cpp session1Interface.cpp session1Proxy.cpp synchronization1Interface.cpp synchronization1Proxy.cpp transfer1Interface.cpp transfer1Proxy.cpp propertiesProxy.h propertiesProxy.cpp )
-
+
##### ObjectManager #########################
add_custom_command(
OUTPUT ${ObjectManager_HDRS} ${ObjectManager_SRCS}
@@ -45,7 +35,7 @@ add_custom_command(
DEPENDS ${INTROSPECTIONPATH}/org.freedesktop.DBus.ObjectManager.xml
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
)
-make_moc ( objectmanagerProxy )
+
##### Agent #########################
add_custom_command(
@@ -54,7 +44,7 @@ add_custom_command(
DEPENDS ${INTROSPECTIONPATH}/org.bluez.obex.Agent1.xml
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
)
-make_moc ( agent1Proxy )
+
##### Client #########################
add_custom_command(
@@ -63,15 +53,6 @@ add_custom_command(
DEPENDS ${INTROSPECTIONPATH}/org.bluez.obex.client.xml
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
)
-make_moc ( agentmanager1Proxy )
-make_moc ( client1Proxy )
-make_moc ( filetransfer1Proxy )
-make_moc ( objectpush1Proxy )
-make_moc ( phonebookaccess1Proxy )
-make_moc ( session1Proxy )
-make_moc ( synchronization1Proxy )
-make_moc ( transfer1Proxy )
-make_moc ( propertiesProxy )
tde_add_library( obexinterfaces STATIC_PIC AUTOMOC
SOURCES ${ObjectManager_SRCS} ${Agent_SRCS} ${Client_SRCS}