From 23bbec8ad922da14738d9a27e4a4fb3ea6b0a0e7 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Thu, 10 Sep 2015 00:42:40 +0200 Subject: GIT_SILENT Upgrade KDE Applications version to 15.08.1. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 1db40d13b..d98f26121 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ project(Dolphin) # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "15") set (KDE_APPLICATIONS_VERSION_MINOR "08") -set (KDE_APPLICATIONS_VERSION_MICRO "0") +set (KDE_APPLICATIONS_VERSION_MICRO "1") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") set(QT_MIN_VERSION "5.4.0") -- cgit v1.3.1 From 6e218c4c146c08626c6bf4c87e9849a9de7462c4 Mon Sep 17 00:00:00 2001 From: Michael Palimaka Date: Sat, 26 Sep 2015 05:34:26 +1000 Subject: Fix KF5Activities being optional. If found via find_package(KF5 COMPONENTS Activities) instead, it will inherit REQUIRED from the previous call. REVIEW: 125360 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index d98f26121..d926e9f0b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -66,7 +66,7 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS WindowSystem Notifications ) -find_package(KF5 ${KF5_MIN_VERSION} COMPONENTS +find_package(KF5 ${KF5_MIN_VERSION} OPTIONAL_COMPONENTS Activities ) -- cgit v1.3.1