From 4102286a73afc79eeafaadbdd28ca8d8540c2208 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sat, 22 Nov 2014 19:54:24 +0000 Subject: [PATCH] adjust for kactivities --- kwin/CMakeLists.txt | 2 +- kwin/kcmkwin/kwinrules/CMakeLists.txt | 4 ++-- libs/taskmanager/CMakeLists.txt | 2 +- plasma/desktop/applets/pager/CMakeLists.txt | 2 +- plasma/desktop/shell/CMakeLists.txt | 2 +- plasma/generic/dataengines/activities/CMakeLists.txt | 2 +- .../declarativeimports/plasmaextracomponents/CMakeLists.txt | 2 +- plasma/generic/runners/activities/CMakeLists.txt | 2 +- powerdevil/daemon/CMakeLists.txt | 2 +- powerdevil/kcmodule/activities/CMakeLists.txt | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/kwin/CMakeLists.txt b/kwin/CMakeLists.txt index 62d51a88..75b8dd97 100644 --- a/kwin/CMakeLists.txt +++ b/kwin/CMakeLists.txt @@ -275,7 +275,7 @@ if(KWIN_BUILD_SCRIPTING) endif() if(KWIN_BUILD_ACTIVITIES) - set(kwin_KDE_LIBS ${kwin_KDE_LIBS} ${KACTIVITIES_LIBS}) + set(kwin_KDE_LIBS ${kwin_KDE_LIBS} ${KACTIVITIES_LIBRARIES}) include_directories(${KACTIVITIES_INCLUDE_DIR}) endif() diff --git a/kwin/kcmkwin/kwinrules/CMakeLists.txt b/kwin/kcmkwin/kwinrules/CMakeLists.txt index bb1a6edb..3cfc1dcc 100644 --- a/kwin/kcmkwin/kwinrules/CMakeLists.txt +++ b/kwin/kcmkwin/kwinrules/CMakeLists.txt @@ -18,7 +18,7 @@ set(kwin_kcm_rules_XCB_LIBS ${X11_XCB_LIBRARIES} ) -target_link_libraries(kdeinit_kwin_rules_dialog ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${X11_LIBRARIES} ${KACTIVITIES_LIBS} ${kwin_kcm_rules_XCB_LIBS}) +target_link_libraries(kdeinit_kwin_rules_dialog ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${X11_LIBRARIES} ${KACTIVITIES_LIBRARIES} ${kwin_kcm_rules_XCB_LIBS}) install(TARGETS kdeinit_kwin_rules_dialog ${INSTALL_TARGETS_DEFAULT_ARGS} ) install(TARGETS kwin_rules_dialog DESTINATION ${LIBEXEC_INSTALL_DIR} ) @@ -30,7 +30,7 @@ set(kcm_kwinrules_PART_SRCS kcm.cpp ${kwinrules_SRCS}) kde4_add_plugin(kcm_kwinrules ${kcm_kwinrules_PART_SRCS}) -target_link_libraries(kcm_kwinrules ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${X11_LIBRARIES} ${KACTIVITIES_LIBS} ${kwin_kcm_rules_XCB_LIBS}) +target_link_libraries(kcm_kwinrules ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${X11_LIBRARIES} ${KACTIVITIES_LIBRARIES} ${kwin_kcm_rules_XCB_LIBS}) install(TARGETS kcm_kwinrules DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/libs/taskmanager/CMakeLists.txt b/libs/taskmanager/CMakeLists.txt index 82209192..17cda2d3 100644 --- a/libs/taskmanager/CMakeLists.txt +++ b/libs/taskmanager/CMakeLists.txt @@ -31,7 +31,7 @@ set(taskmanager_LIB_SRCS ${taskmanager_LIB_SRCS} task_x11.cpp) kde4_add_library(taskmanager SHARED ${taskmanager_LIB_SRCS}) -target_link_libraries(taskmanager processcore ${KACTIVITIES_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${X11_LIBRARIES}) +target_link_libraries(taskmanager processcore ${KACTIVITIES_LIBRARIES} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${X11_LIBRARIES}) if (X11_Xfixes_FOUND) target_link_libraries(taskmanager ${X11_Xfixes_LIB}) endif (X11_Xfixes_FOUND) diff --git a/plasma/desktop/applets/pager/CMakeLists.txt b/plasma/desktop/applets/pager/CMakeLists.txt index 88a39b55..8d3d5ed5 100644 --- a/plasma/desktop/applets/pager/CMakeLists.txt +++ b/plasma/desktop/applets/pager/CMakeLists.txt @@ -12,7 +12,7 @@ target_link_libraries(plasma_applet_pager ${KDE4_KIO_LIBS} ${KDE4_PLASMA_LIBS} ${KDE4_KCMUTILS_LIBRARY} - ${KACTIVITIES_LIBS} + ${KACTIVITIES_LIBRARIES} ${QT_QTDECLARATIVE_LIBRARY} taskmanager) diff --git a/plasma/desktop/shell/CMakeLists.txt b/plasma/desktop/shell/CMakeLists.txt index 068f9491..66796806 100644 --- a/plasma/desktop/shell/CMakeLists.txt +++ b/plasma/desktop/shell/CMakeLists.txt @@ -49,7 +49,7 @@ kde4_add_app_icon(plasma_SRCS "${KDE4_INSTALL_DIR}/share/icons/oxygen/*/apps/pla kde4_add_kdeinit_executable(plasma-desktop ${plasma_SRCS}) -target_link_libraries(kdeinit_plasma-desktop ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KTEXTEDITOR_LIBS} ${KDE4_KIDLETIME_LIBS} ${QT_QTSCRIPT_LIBRARY} kworkspace ${KACTIVITIES_LIBS} plasmagenericshell ${QT_QTDECLARATIVE_LIBRARY}) +target_link_libraries(kdeinit_plasma-desktop ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KTEXTEDITOR_LIBS} ${KDE4_KIDLETIME_LIBS} ${QT_QTSCRIPT_LIBRARY} kworkspace ${KACTIVITIES_LIBRARIES} plasmagenericshell ${QT_QTDECLARATIVE_LIBRARY}) if(UNIX AND Q_WS_X11) target_link_libraries(kdeinit_plasma-desktop ${X11_LIBRARIES}) diff --git a/plasma/generic/dataengines/activities/CMakeLists.txt b/plasma/generic/dataengines/activities/CMakeLists.txt index be78ceff..6ddd7e6b 100644 --- a/plasma/generic/dataengines/activities/CMakeLists.txt +++ b/plasma/generic/dataengines/activities/CMakeLists.txt @@ -18,7 +18,7 @@ kde4_add_plugin(plasma_engine_activities ${activity_engine_SRCS}) target_link_libraries(plasma_engine_activities ${KDE4_KDECORE_LIBS} ${KDE4_PLASMA_LIBS} - ${KACTIVITIES_LIBS}) + ${KACTIVITIES_LIBRARIES}) install(TARGETS plasma_engine_activities DESTINATION ${PLUGIN_INSTALL_DIR}) diff --git a/plasma/generic/declarativeimports/plasmaextracomponents/CMakeLists.txt b/plasma/generic/declarativeimports/plasmaextracomponents/CMakeLists.txt index dbe86915..3579df2d 100644 --- a/plasma/generic/declarativeimports/plasmaextracomponents/CMakeLists.txt +++ b/plasma/generic/declarativeimports/plasmaextracomponents/CMakeLists.txt @@ -14,7 +14,7 @@ qt4_automoc(${plasmaextracomponents_SRCS}) add_library(plasmaextracomponentsplugin SHARED ${plasmaextracomponents_SRCS}) target_link_libraries(plasmaextracomponentsplugin ${QT_QTCORE_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} - ${QT_QTGUI_LIBRARY} ${KDE4_PLASMA_LIBS} ${KACTIVITIES_LIBS} ) + ${QT_QTGUI_LIBRARY} ${KDE4_PLASMA_LIBS} ${${KACTIVITIES_LIBRARIES}} ) install(TARGETS plasmaextracomponentsplugin DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/plasma/extras) diff --git a/plasma/generic/runners/activities/CMakeLists.txt b/plasma/generic/runners/activities/CMakeLists.txt index 8f058a3f..c5e2337f 100644 --- a/plasma/generic/runners/activities/CMakeLists.txt +++ b/plasma/generic/runners/activities/CMakeLists.txt @@ -5,7 +5,7 @@ set(krunner_activities_SRCS ) kde4_add_plugin(krunner_activities ${krunner_activities_SRCS}) -target_link_libraries(krunner_activities ${KDE4_PLASMA_LIBS} ${KACTIVITIES_LIBS}) +target_link_libraries(krunner_activities ${KDE4_PLASMA_LIBS} ${KACTIVITIES_LIBRARIES}) install(TARGETS krunner_activities DESTINATION ${PLUGIN_INSTALL_DIR}) install(FILES plasma-runner-activityrunner.desktop DESTINATION ${SERVICES_INSTALL_DIR}) diff --git a/powerdevil/daemon/CMakeLists.txt b/powerdevil/daemon/CMakeLists.txt index a7125a33..e7f1b3ef 100644 --- a/powerdevil/daemon/CMakeLists.txt +++ b/powerdevil/daemon/CMakeLists.txt @@ -54,7 +54,7 @@ target_link_libraries(powerdevilcore ${KDE4_SOLID_LIBS} ${KDE4_KIDLETIME_LIBS} ${KDE4_PLASMA_LIBS} - ${KACTIVITIES_LIBS} + ${KACTIVITIES_LIBRARIES} kworkspace ) diff --git a/powerdevil/kcmodule/activities/CMakeLists.txt b/powerdevil/kcmodule/activities/CMakeLists.txt index 97cc251b..afe5ce82 100644 --- a/powerdevil/kcmodule/activities/CMakeLists.txt +++ b/powerdevil/kcmodule/activities/CMakeLists.txt @@ -18,7 +18,7 @@ target_link_libraries(kcm_powerdevilactivitiesconfig ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBRARY} ${KDE4_SOLID_LIBS} - ${KACTIVITIES_LIBS} + ${KACTIVITIES_LIBRARIES} powerdevilconfigcommonprivate )