diff options
| author | Slávek Banko <[email protected]> | 2023-03-07 01:47:18 +0100 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2023-03-07 01:47:18 +0100 |
| commit | 6740c7de32165717a85bd6fa69b35c93ae6499c0 (patch) | |
| tree | 6a0d5c8473d85f58344a3dd4fa33b942a44333d6 /src/libtdebluez/interfaces | |
| parent | b8225d27fca0564fda7f39b37d0e84b2654d2e49 (diff) | |
| download | tdebluez-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/libtdebluez/interfaces')
| -rw-r--r-- | src/libtdebluez/interfaces/CMakeLists.txt | 31 |
1 files changed, 6 insertions, 25 deletions
diff --git a/src/libtdebluez/interfaces/CMakeLists.txt b/src/libtdebluez/interfaces/CMakeLists.txt index 2f44a83..4eba55d 100644 --- a/src/libtdebluez/interfaces/CMakeLists.txt +++ b/src/libtdebluez/interfaces/CMakeLists.txt @@ -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} |