TDE
/
tdebluez
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdebluez
0
0
Fork 0
Code Issues Releases Wiki Activity

Take advantage of automoc support for generated files.

Browse Source 
Macro make_moc and its explicit calls is no longer needed.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/6/head
Slávek Banko 2 years ago
parent b8225d27fc
commit 6740c7de32
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668
2 changed files with 9 additions and 47 deletions
Show Stats Download Patch File Download Diff File

31
src/libtdebluez/interfaces/CMakeLists.txt
Unescape View File

@ -33,16 +33,6 @@ set( Adapter_SRCS adapter1Interface.cpp adapter1Proxy.cpp gattmanager1Interface.
set( Device_HDRS device1Interface.h device1Proxy.h mediacontrol1Interface.h mediacontrol1Proxy.h)
set( Device_SRCS device1Interface.cpp device1Proxy.cpp mediacontrol1Interface.cpp mediacontrol1Proxy.cpp )
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( )
#function( install_header fileinput target )
# install(
# FILES ${CMAKE_CURRENT_BUILD_DIR}/${fileinput}
@ -50,7 +40,7 @@ endfunction( )
# )
#endfunction( )
##### ObjectManager #########################
add_custom_command(
OUTPUT ${ObjectManager_HDRS} ${ObjectManager_SRCS}
@ -58,7 +48,7 @@ add_custom_command(
DEPENDS ${INTROSPECTIONPATH}/org.freedesktop.DBus.ObjectManager.xml
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
)
make_moc ( objectmanagerProxy )
##### AgentManager #########################
add_custom_command(
@ -67,9 +57,7 @@ add_custom_command(
DEPENDS ${INTROSPECTIONPATH}/org.bluez.manager.xml
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
)
make_moc ( agentmanager1Proxy )
make_moc ( healthmanager1Proxy )
make_moc ( profilemanager1Proxy )
##### Agent #########################
add_custom_command(
@ -78,7 +66,7 @@ add_custom_command(
DEPENDS ${INTROSPECTIONPATH}/org.tdebluez.agent.xml
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
)
make_moc ( agent1Proxy )
##### Adapter #########################
add_custom_command(
@ -87,11 +75,8 @@ add_custom_command(
DEPENDS ${INTROSPECTIONPATH}/org.bluez.adapter.xml
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
)
make_moc ( adapter1Proxy )
make_moc ( gattmanager1Proxy )
make_moc ( networkserver1Proxy )
make_moc ( propertiesProxy )
##### Device #########################
add_custom_command(
OUTPUT ${Device_HDRS} ${Device_SRCS}
@ -99,10 +84,6 @@ add_custom_command(
DEPENDS ${INTROSPECTIONPATH}/org.bluez.device.xml
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
)
make_moc ( device1Proxy )
make_moc ( propertiesProxy )
make_moc ( mediacontrol1Proxy )
make_moc ( media1Proxy )
tde_add_library( bluezinterfaces STATIC_PIC AUTOMOC
SOURCES ${ObjectManager_SRCS} ${AgentManager_SRCS} ${Agent_SRCS} ${Adapter_SRCS} ${Device_SRCS}

25
src/libtdeobex/interfaces/CMakeLists.txt
Unescape View File

@ -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}

Write Preview
Loading…
Cancel
Save