From kde-commits Sat Jan 31 20:39:25 2015 From: Yury G. Kudryashov Date: Sat, 31 Jan 2015 20:39:25 +0000 To: kde-commits Subject: [kate] /: State required KF5 version Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=142273677323212 Git commit 75777fae24dbfa07e696678655289464d760534c by Yury G. Kudryashov. Committed on 26/01/2015 at 14:20. Pushed by kudryashov into branch 'master'. State required KF5 version Use KF5_DEP_VERSION variable, as in frameworks. REVIEW: 122261 M +2 -1 CMakeLists.txt M +1 -1 addons/CMakeLists.txt http://commits.kde.org/kate/75777fae24dbfa07e696678655289464d760534c diff --git a/CMakeLists.txt b/CMakeLists.txt index e8f47ed..408f502 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,6 +4,7 @@ project (kate) # minimal requirements cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR) set (QT_MIN_VERSION "5.2.0") +set(KF5_DEP_VERSION "5.6.0") = # set the kate version, used for part / kate / kwrite set (KATE_VERSION_MAJOR 5) @@ -33,7 +34,7 @@ include(KDECompilerSettings) find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core DBus Widgets Scrip= t Sql Test) = # Load the frameworks we need -find_package(KF5 REQUIRED COMPONENTS +find_package(KF5 "${KF5_DEP_VERSION}" REQUIRED COMPONENTS Config DocTools GuiAddons diff --git a/addons/CMakeLists.txt b/addons/CMakeLists.txt index 110e6c6..5734f9e 100644 --- a/addons/CMakeLists.txt +++ b/addons/CMakeLists.txt @@ -1,5 +1,5 @@ # detect aditional frameworks -find_package(KF5 OPTIONAL_COMPONENTS Wallet Plasma Service ItemModels Noti= fications ThreadWeaver NewStuff) +find_package(KF5 "${KF5_DEP_VERSION}" OPTIONAL_COMPONENTS Wallet Plasma Se= rvice ItemModels Notifications ThreadWeaver NewStuff) = set_package_properties(KF5Wallet PROPERTIES PURPOSE "Required to build the= katesql addon") set_package_properties(KF5Plasma PROPERTIES PURPOSE "Required to build the= sessionapplet addon")