summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukáš Tinkl <lukas@kde.org>2014-08-10 15:40:24 (GMT)
committerLukáš Tinkl <lukas@kde.org>2014-08-10 15:40:24 (GMT)
commitb32306463cad7f73b584ff2042d11e0032ef4544 (patch)
tree37102aa3e5f0c1a37e8b6d83958701bfa2822907
parent0c7a45c7a53486028cf1d8515a3005293ae8e5ad (diff)
look for KF5 versions of libkscreen and kactivities
-rw-r--r--CMakeLists.txt4
-rw-r--r--shell/CMakeLists.txt3
2 files changed, 3 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8db2a70..6586ccd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,7 +16,7 @@ include(ECMSetupVersion)
include(ECMOptionalAddSubdirectory)
find_package(Qt5 CONFIG REQUIRED COMPONENTS Core DBus Test Widgets PrintSupport Svg)
-find_package(KF5 REQUIRED
+find_package(KF5 REQUIRED COMPONENTS
Activities
Archive
Bookmarks
@@ -43,7 +43,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake/modules)
# TYPE RECOMMENDED
# PURPOSE "Required to build Okular.")
-find_package(LibKScreen "1.0.2")
+find_package(KF5Screen)
set_package_properties("LibKScreen" PROPERTIES
DESCRIPTION "KDE screen management library"
URL "https://projects.kde.org/projects/kdereview/libkscreen"
diff --git a/shell/CMakeLists.txt b/shell/CMakeLists.txt
index bdcdbf0..834a36b 100644
--- a/shell/CMakeLists.txt
+++ b/shell/CMakeLists.txt
@@ -4,7 +4,7 @@ include_directories(
)
# checking whether we should enable activities support
-find_package(KActivities "6.1.0")
+find_package(KF5Activities)
set_package_properties("KActivities" PROPERTIES
DESCRIPTION "Activities interface library"
URL "https://projects.kde.org/projects/kde/kdelibs/kactivities"
@@ -38,4 +38,3 @@ install(TARGETS okular ${INSTALL_TARGETS_DEFAULT_ARGS})
install( PROGRAMS okular.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
install( FILES shell.rc DESTINATION ${DATA_INSTALL_DIR}/okular )
-