alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Port to updated KActivities

Browse Source
This commit is contained in:
David Faure 2014-02-08 18:48:40 +01:00
parent f9e5cc949f
commit e76d11be9d
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -36,20 +36,14 @@ endif()
################# now find all used packages ################# ################# now find all used packages #################
set (QT_MIN_VERSION "5.2.0") set (QT_MIN_VERSION "5.2.0")
set(KF5_VERSION "4.96.0")
find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Quick X11Extras Sql UiTools Qml Widgets Svg Declarative Script Test PrintSupport) find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Quick X11Extras Sql UiTools Qml Widgets Svg Declarative Script Test PrintSupport)
find_package(KF5 CONFIG REQUIRED IdleTime ItemModels WidgetsAddons WindowSystem Codecs Archive CoreAddons Solid ThreadWeaver GlobalAccel find_package(KF5 CONFIG REQUIRED IdleTime ItemModels WidgetsAddons WindowSystem Codecs Archive CoreAddons Solid ThreadWeaver GlobalAccel
Config Auth JS Wallet DBusAddons I18n GuiAddons ConfigWidgets Config Auth JS Wallet DBusAddons I18n GuiAddons ConfigWidgets
Service ItemViews Notifications IconThemes Completion JobWidgets Sonnet TextWidgets XmlGui Crash Service ItemViews Notifications IconThemes Completion JobWidgets Sonnet TextWidgets XmlGui Crash
Bookmarks Declarative UnitConversion Parts Kross KIO DNSSD) Bookmarks Declarative UnitConversion Parts Kross KIO DNSSD Activities)
find_package(KActivities 5.0.0 CONFIG REQUIRED)
set_package_properties(KActivities PROPERTIES DESCRIPTION "The KActivities library"
URL "https://projects.kde.org/kactivities"
TYPE REQUIRED
)
#optional features #optional features
find_package(X11 MODULE) find_package(X11 MODULE)
@ -133,7 +127,6 @@ configure_file(config-compiler.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-compil
include(CMakePackageConfigHelpers) include(CMakePackageConfigHelpers)
include(ECMSetupVersion) include(ECMSetupVersion)
set(KF5_VERSION "4.96.0")
ecm_setup_version(${KF5_VERSION} ecm_setup_version(${KF5_VERSION}
VARIABLE_PREFIX PLASMA VARIABLE_PREFIX PLASMA
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/plasma_version.h" VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/plasma_version.h"

2
src/scriptengines/qml/CMakeLists.txt
View File

@ -24,7 +24,7 @@ target_link_libraries(plasma_appletscript_declarative
Qt5::Qml Qt5::Qml
Qt5::Script Qt5::Script
Qt5::UiTools Qt5::UiTools
KF5::KActivities KF5::Activities
KF5::KIOCore KF5::KIOCore
KF5::KIOWidgets KF5::KIOWidgets
KF5::Declarative KF5::Declarative

4
src/shell/CMakeLists.txt
View File

@ -17,7 +17,7 @@ find_package(Qt5Script REQUIRED)
find_package(KF5CoreAddons REQUIRED) find_package(KF5CoreAddons REQUIRED)
find_package(KF5Crash REQUIRED) find_package(KF5Crash REQUIRED)
find_package(KF5Solid REQUIRED) find_package(KF5Solid REQUIRED)
find_package(KActivities REQUIRED) find_package(KF5Activities REQUIRED)
set(scripting_SRC set(scripting_SRC
scripting/appinterface.cpp scripting/appinterface.cpp
@ -68,7 +68,7 @@ target_link_libraries(plasma-shell
KF5::I18n KF5::I18n
KF5::XmlGui KF5::XmlGui
KF5::IconThemes KF5::IconThemes
KF5::KActivities KF5::Activities
) )
target_include_directories(plasma-shell PRIVATE "${CMAKE_BINARY_DIR}") target_include_directories(plasma-shell PRIVATE "${CMAKE_BINARY_DIR}")