diff --git a/cli/CMakeLists.txt b/cli/CMakeLists.txt index 6bc525e79..0eb84026b 100644 --- a/cli/CMakeLists.txt +++ b/cli/CMakeLists.txt @@ -2,6 +2,6 @@ include_directories(${CMAKE_SOURCE_DIR}) add_executable(kdeconnect-cli kdeconnect-cli.cpp) -target_link_libraries(kdeconnect-cli kdeconnect ${QT_QTGUI_LIBRARY} ${KDE4_KDEUI_LIBS}) +target_link_libraries(kdeconnect-cli kdeconnectinterfaces ${QT_QTGUI_LIBRARY} ${KDE4_KDEUI_LIBS}) install(TARGETS kdeconnect-cli ${INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/interfaces/CMakeLists.txt b/interfaces/CMakeLists.txt index f5faefa08..498537603 100644 --- a/interfaces/CMakeLists.txt +++ b/interfaces/CMakeLists.txt @@ -39,18 +39,18 @@ set(libkdeconnect_HEADERS set_source_files_properties( ${CMAKE_BINARY_DIR}/core/org.kde.kdeconnect.daemon.xml ${CMAKE_BINARY_DIR}/core/org.kde.kdeconnect.device.xml - ${CMAKE_BINARY_DIR}/core/plugins/battery/org.kde.kdeconnect.device.battery.xml - ${CMAKE_BINARY_DIR}/core/plugins/sftp/org.kde.kdeconnect.device.sftp.xml - ${CMAKE_BINARY_DIR}/core/plugins/notifications/org.kde.kdeconnect.device.notifications.xml - ${CMAKE_BINARY_DIR}/core/plugins/notifications/org.kde.kdeconnect.device.notifications.notification.xml + ${CMAKE_BINARY_DIR}/plugins/battery/org.kde.kdeconnect.device.battery.xml + ${CMAKE_BINARY_DIR}/plugins/sftp/org.kde.kdeconnect.device.sftp.xml + ${CMAKE_BINARY_DIR}/plugins/notifications/org.kde.kdeconnect.device.notifications.xml + ${CMAKE_BINARY_DIR}/plugins/notifications/org.kde.kdeconnect.device.notifications.notification.xml PROPERTIES NO_NAMESPACE true ) qt4_add_dbus_interface(libkdeconnect_SRC ${CMAKE_BINARY_DIR}/core/org.kde.kdeconnect.daemon.xml daemoninterface) qt4_add_dbus_interface(libkdeconnect_SRC ${CMAKE_BINARY_DIR}/core/org.kde.kdeconnect.device.xml deviceinterface) -qt4_add_dbus_interface(libkdeconnect_SRC ${CMAKE_BINARY_DIR}/core/plugins/battery/org.kde.kdeconnect.device.battery.xml devicebatteryinterface ) -qt4_add_dbus_interface(libkdeconnect_SRC ${CMAKE_BINARY_DIR}/core/plugins/sftp/org.kde.kdeconnect.device.sftp.xml devicesftpinterface ) -qt4_add_dbus_interface(libkdeconnect_SRC ${CMAKE_BINARY_DIR}/core/plugins/notifications/org.kde.kdeconnect.device.notifications.xml devicenotificationsinterface ) -qt4_add_dbus_interface(libkdeconnect_SRC ${CMAKE_BINARY_DIR}/core/plugins/notifications/org.kde.kdeconnect.device.notifications.notification.xml notificationinterface ) +qt4_add_dbus_interface(libkdeconnect_SRC ${CMAKE_BINARY_DIR}/plugins/battery/org.kde.kdeconnect.device.battery.xml devicebatteryinterface ) +qt4_add_dbus_interface(libkdeconnect_SRC ${CMAKE_BINARY_DIR}/plugins/sftp/org.kde.kdeconnect.device.sftp.xml devicesftpinterface ) +qt4_add_dbus_interface(libkdeconnect_SRC ${CMAKE_BINARY_DIR}/plugins/notifications/org.kde.kdeconnect.device.notifications.xml devicenotificationsinterface ) +qt4_add_dbus_interface(libkdeconnect_SRC ${CMAKE_BINARY_DIR}/plugins/notifications/org.kde.kdeconnect.device.notifications.notification.xml notificationinterface ) kde4_add_library(kdeconnectinterfaces SHARED ${libkdeconnect_SRC}) set_target_properties(kdeconnectinterfaces PROPERTIES diff --git a/kio/CMakeLists.txt b/kio/CMakeLists.txt index 8a0754d24..f0e44fb0c 100644 --- a/kio/CMakeLists.txt +++ b/kio/CMakeLists.txt @@ -6,7 +6,7 @@ set(kio_kdeconnect_PART_SRCS kde4_add_plugin(kio_kdeconnect ${kio_kdeconnect_PART_SRCS}) -add_dependencies(kio_kdeconnect libkdeconnect) +add_dependencies(kio_kdeconnect libkdeconnectinterfaces) target_link_libraries(kio_kdeconnect ${KDE4_KDECORE_LIBS} @@ -14,7 +14,7 @@ target_link_libraries(kio_kdeconnect ${KDE4_KDEUI_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} - kdeconnect + kdeconnectinterfaces ) ########### install files ############### diff --git a/plasmoid/declarativeplugin/CMakeLists.txt b/plasmoid/declarativeplugin/CMakeLists.txt index 4919d471c..c2a0310f9 100644 --- a/plasmoid/declarativeplugin/CMakeLists.txt +++ b/plasmoid/declarativeplugin/CMakeLists.txt @@ -15,14 +15,14 @@ set(kdeconnectdeclarativeplugin_MOC qt4_wrap_cpp(kdeconnectdeclarativeplugin_SRC ${kdeconnectdeclarativeplugin_MOC}) kde4_add_library(kdeconnectdeclarativeplugin SHARED ${kdeconnectdeclarativeplugin_SRC}) -add_dependencies(kdeconnectdeclarativeplugin libkdeconnect) +add_dependencies(kdeconnectdeclarativeplugin libkdeconnectinterfaces) target_link_libraries(kdeconnectdeclarativeplugin ${KDE4_KDEUI_LIBS} ${KDE4_KDECORE_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} - kdeconnect + kdeconnectinterfaces ) install(TARGETS kdeconnectdeclarativeplugin DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/kdeconnect) install(FILES qmldir DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/kdeconnect)