• R/O
  • HTTP
  • SSH
  • HTTPS

kde-extraapps: Commit

Katana extra applications


Commit MetaInfo

Revision1af6ef7828124b0ca62a12a0d5be8339e2e17bca (tree)
Time2022-09-27 21:39:27
AuthorIvailo Monev <xakepa10@gmai...>
CommiterIvailo Monev

Log Message

kdeplasma-addons: get rid of the custom qt4_add_dbus_interface_ex() macro by setting INCLUDE property on interface file

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

Change Summary

Incremental Difference

--- a/kdeplasma-addons/applets/icontasks/CMakeLists.txt
+++ b/kdeplasma-addons/applets/icontasks/CMakeLists.txt
@@ -40,32 +40,8 @@ qt4_add_dbus_adaptor(tasks_SRCS net.launchpad.DockItem.xml dockitem.h DockItem)
4040
4141 qt4_add_dbus_interface(tasks_SRCS org.mpris.MediaPlayer2.Player.xml playerv2interface)
4242
43-MACRO(QT4_ADD_DBUS_INTERFACE_EX _sources _interface _basename _extrainclude)
44-# GET_FILENAME_COMPONENT(_infile ${_interface} ABSOLUTE)
45- set(_infile ${CMAKE_CURRENT_SOURCE_DIR}/${_interface})
46-
47- SET(_header ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.h)
48- SET(_impl ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp)
49- SET(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.moc)
50-
51- # handling more arguments (as in FindQt4.cmake from KDE4) will come soon, then
52- # _params will be used for more than just -m
53- SET(_params -m)
54-
55- ADD_CUSTOM_COMMAND(OUTPUT ${_impl} ${_header}
56- COMMAND ${QT_DBUSXML2CPP_EXECUTABLE} ${_params} -i ${_extrainclude} -p ${_basename} ${_infile}
57- DEPENDS ${_infile})
58-
59- SET_SOURCE_FILES_PROPERTIES(${_impl} PROPERTIES SKIP_AUTOMOC TRUE)
60-
61- QT4_GENERATE_MOC(${_header} ${_moc})
62-
63- SET(${_sources} ${${_sources}} ${_impl} ${_header} ${_moc})
64- MACRO_ADD_FILE_DEPENDENCIES(${_impl} ${_moc})
65-
66-ENDMACRO(QT4_ADD_DBUS_INTERFACE_EX)
67-
68-qt4_add_dbus_interface_ex(tasks_SRCS org.freedesktop.MediaPlayer.player.xml playerv1interface dbusstatus.h)
43+set_source_files_properties(org.freedesktop.MediaPlayer.player.xml PROPERTIES INCLUDE "dbusstatus.h")
44+qt4_add_dbus_interface(tasks_SRCS org.freedesktop.MediaPlayer.player.xml playerv1interface)
6945
7046 kde4_add_plugin(plasma_applet_icontasks ${tasks_SRCS})
7147
Show on old repository browser