Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-23 18:32:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

adjust for kactivities

Browse source
This commit is contained in:
Ivailo Monev 2014-11-22 19:54:24 +00:00
parent 2b125b14b4
commit 4102286a73
10 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kwin/CMakeLists.txt
View file

@ -275,7 +275,7 @@ if(KWIN_BUILD_SCRIPTING)
endif() endif()
if(KWIN_BUILD_ACTIVITIES) 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}) include_directories(${KACTIVITIES_INCLUDE_DIR})
endif() endif()

4
kwin/kcmkwin/kwinrules/CMakeLists.txt
View file

@ -18,7 +18,7 @@ set(kwin_kcm_rules_XCB_LIBS
${X11_XCB_LIBRARIES} ${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 kdeinit_kwin_rules_dialog ${INSTALL_TARGETS_DEFAULT_ARGS} )
install(TARGETS kwin_rules_dialog DESTINATION ${LIBEXEC_INSTALL_DIR} ) 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}) 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} ) install(TARGETS kcm_kwinrules DESTINATION ${PLUGIN_INSTALL_DIR} )

2
libs/taskmanager/CMakeLists.txt
View file

@ -31,7 +31,7 @@ set(taskmanager_LIB_SRCS ${taskmanager_LIB_SRCS} task_x11.cpp)
kde4_add_library(taskmanager SHARED ${taskmanager_LIB_SRCS}) 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) if (X11_Xfixes_FOUND)
target_link_libraries(taskmanager ${X11_Xfixes_LIB}) target_link_libraries(taskmanager ${X11_Xfixes_LIB})
endif (X11_Xfixes_FOUND) endif (X11_Xfixes_FOUND)

2
plasma/desktop/applets/pager/CMakeLists.txt
View file

@ -12,7 +12,7 @@ target_link_libraries(plasma_applet_pager
${KDE4_KIO_LIBS} ${KDE4_KIO_LIBS}
${KDE4_PLASMA_LIBS} ${KDE4_PLASMA_LIBS}
${KDE4_KCMUTILS_LIBRARY} ${KDE4_KCMUTILS_LIBRARY}
${KACTIVITIES_LIBS} ${KACTIVITIES_LIBRARIES}
${QT_QTDECLARATIVE_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY}
taskmanager) taskmanager)

2
plasma/desktop/shell/CMakeLists.txt
View file

@ -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}) 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) if(UNIX AND Q_WS_X11)
target_link_libraries(kdeinit_plasma-desktop ${X11_LIBRARIES}) target_link_libraries(kdeinit_plasma-desktop ${X11_LIBRARIES})

2
plasma/generic/dataengines/activities/CMakeLists.txt
View file

@ -18,7 +18,7 @@ kde4_add_plugin(plasma_engine_activities ${activity_engine_SRCS})
target_link_libraries(plasma_engine_activities target_link_libraries(plasma_engine_activities
${KDE4_KDECORE_LIBS} ${KDE4_KDECORE_LIBS}
${KDE4_PLASMA_LIBS} ${KDE4_PLASMA_LIBS}
${KACTIVITIES_LIBS}) ${KACTIVITIES_LIBRARIES})
install(TARGETS plasma_engine_activities install(TARGETS plasma_engine_activities
DESTINATION ${PLUGIN_INSTALL_DIR}) DESTINATION ${PLUGIN_INSTALL_DIR})

2
plasma/generic/declarativeimports/plasmaextracomponents/CMakeLists.txt
View file

@ -14,7 +14,7 @@ qt4_automoc(${plasmaextracomponents_SRCS})
add_library(plasmaextracomponentsplugin SHARED ${plasmaextracomponents_SRCS}) add_library(plasmaextracomponentsplugin SHARED ${plasmaextracomponents_SRCS})
target_link_libraries(plasmaextracomponentsplugin ${QT_QTCORE_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} 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) install(TARGETS plasmaextracomponentsplugin DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/plasma/extras)

2
plasma/generic/runners/activities/CMakeLists.txt
View file

@ -5,7 +5,7 @@ set(krunner_activities_SRCS
) )
kde4_add_plugin(krunner_activities ${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(TARGETS krunner_activities DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES plasma-runner-activityrunner.desktop DESTINATION ${SERVICES_INSTALL_DIR}) install(FILES plasma-runner-activityrunner.desktop DESTINATION ${SERVICES_INSTALL_DIR})

2
powerdevil/daemon/CMakeLists.txt
View file

@ -54,7 +54,7 @@ target_link_libraries(powerdevilcore
${KDE4_SOLID_LIBS} ${KDE4_SOLID_LIBS}
${KDE4_KIDLETIME_LIBS} ${KDE4_KIDLETIME_LIBS}
${KDE4_PLASMA_LIBS} ${KDE4_PLASMA_LIBS}
${KACTIVITIES_LIBS} ${KACTIVITIES_LIBRARIES}
kworkspace kworkspace
) )

2
powerdevil/kcmodule/activities/CMakeLists.txt
View file

@ -18,7 +18,7 @@ target_link_libraries(kcm_powerdevilactivitiesconfig
${KDE4_KDECORE_LIBS} ${KDE4_KDECORE_LIBS}
${KDE4_KDEUI_LIBRARY} ${KDE4_KDEUI_LIBRARY}
${KDE4_SOLID_LIBS} ${KDE4_SOLID_LIBS}
${KACTIVITIES_LIBS} ${KACTIVITIES_LIBRARIES}
powerdevilconfigcommonprivate powerdevilconfigcommonprivate
) )