diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 0e6609f..2c1485e 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -1,40 +1,44 @@ ########### next target ############### +set(dbus_interface_name org.kde.khotkeys.xml) set(kded_khotkeys_PART_SRCS kded.cpp - ${CMAKE_CURRENT_BINARY_DIR}/org.kde.khotkeys.xml) + ${CMAKE_CURRENT_BINARY_DIR}/${dbus_interface_name}) -qt5_generate_dbus_interface(kded.h org.kde.khotkeys.xml ) +qt5_generate_dbus_interface(kded.h ${dbus_interface_name}) +set(dbus_interface_xml ${CMAKE_CURRENT_BINARY_DIR}/${dbus_interface_name}) + +add_custom_target(khotkeysdbusinterface ALL DEPENDS ${dbus_interface_name}) add_library(kded_khotkeys MODULE ${kded_khotkeys_PART_SRCS}) set_target_properties(kded_khotkeys PROPERTIES OUTPUT_NAME khotkeys) kcoreaddons_desktop_to_json(kded_khotkeys khotkeys.desktop) target_link_libraries(kded_khotkeys khotkeysprivate PW::KWorkspace KF5::DBusAddons KF5::KDELibs4Support) # I'm not sure if this is needed anymore. Check it if(X11_XTest_FOUND) target_link_libraries(kded_khotkeys ${X11_XTest_LIB}) endif() set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KHotKeysDBusInterface") ecm_configure_package_config_file(KHotKeysDBusInterfaceConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/KHotKeysDBusInterfaceConfig.cmake PATH_VARS KDE_INSTALL_DBUSINTERFACEDIR INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}) ########### install files ############### install(FILES ${CMAKE_CURRENT_BINARY_DIR}/KHotKeysDBusInterfaceConfig.cmake DESTINATION ${CMAKECONFIG_INSTALL_DIR}) install(TARGETS kded_khotkeys DESTINATION ${PLUGIN_INSTALL_DIR}/kf5/kded) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.khotkeys.xml DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR}) diff --git a/kcm_hotkeys/CMakeLists.txt b/kcm_hotkeys/CMakeLists.txt index f0ef3d3..0df2b5c 100644 --- a/kcm_hotkeys/CMakeLists.txt +++ b/kcm_hotkeys/CMakeLists.txt @@ -1,111 +1,112 @@ set( kcm_hotkeys_PART_SRCS kcm_hotkeys.cpp global_settings_widget.cpp hotkeys_export_widget.cpp hotkeys_model.cpp hotkeys_proxy_model.cpp hotkeys_tree_view.cpp hotkeys_context_menu.cpp # HELPER WIDGETS helper_widgets/window_selector.cpp helper_widgets/window_definition_widget.cpp helper_widgets/window_definition_list_widget.cpp helper_widgets/gesture_drawer.cpp helper_widgets/gesture_recorder.cpp helper_widgets/gesture_widget.cpp helper_widgets/edit_gesture_dialog.cpp # TRIGGER WIDGETS triggers/trigger_widget_base.cpp triggers/shortcut_trigger_widget.cpp triggers/window_trigger_widget.cpp triggers/gesture_trigger_widget.cpp # ACTION WIDGETS actions/action_widget_base.cpp actions/command_url_action_widget.cpp actions/dbus_action_widget.cpp actions/menuentry_action_widget.cpp actions/keyboard_input_action_widget.cpp # CONDITION WiDGETS conditions/conditions_widget.cpp conditions/condition_type_menu.cpp # ACTION_DATA WIDGETS hotkeys_widget_iface.cpp hotkeys_widget_base.cpp action_group_widget.cpp simple_action_data_widget.cpp ) kde4_add_ui_files( kcm_hotkeys_PART_SRCS global_settings_widget.ui hotkeys_export_widget.ui kcm_hotkeys.ui # HELPER WIDGETS helper_widgets/window_definition_list_widget.ui helper_widgets/window_definition_widget.ui helper_widgets/gesture_widget.ui # TRIGGER WIDGETS triggers/window_trigger_widget.ui triggers/shortcut_trigger_widget.ui triggers/gesture_trigger_widget.ui # ACTION WIDGETS actions/command_url_action_widget.ui actions/dbus_action_widget.ui actions/menuentry_action_widget.ui actions/keyboard_input_action_widget.ui # CONDITION WiDGETS conditions/conditions_widget.ui # ACTION_DATA WIDGETS hotkeys_widget_base.ui ) qt5_add_dbus_interface( kcm_hotkeys_PART_SRCS ${CMAKE_CURRENT_BINARY_DIR}/../app/org.kde.khotkeys.xml khotkeys_interface) add_library( kcm_hotkeys MODULE ${kcm_hotkeys_PART_SRCS} ) +add_dependencies(kcm_hotkeys khotkeysdbusinterface) target_compile_definitions(kcm_hotkeys PRIVATE -DPROJECT_VERSION="${PROJECT_VERSION}") add_dependencies(kcm_hotkeys kded_khotkeys) target_link_libraries( kcm_hotkeys khotkeysprivate KF5::KCMUtils KF5::I18n KF5::KIOCore KF5::KIOWidgets KF5::TextWidgets KF5::KDELibs4Support Qt5::Gui ${X11_X11_LIB} ) install( TARGETS kcm_hotkeys DESTINATION ${PLUGIN_INSTALL_DIR} ) install( FILES khotkeys.desktop DESTINATION ${SERVICES_INSTALL_DIR} )