diff options
| author | Leslie Zhai <xiangzhai83@gmail.com> | 2016-12-16 05:01:40 (GMT) |
|---|---|---|
| committer | Leslie Zhai <xiangzhai83@gmail.com> | 2016-12-16 05:01:40 (GMT) |
| commit | e0da90a0f2d26456b89b17e65d70f1d5b42dff71 (patch) | |
| tree | 7f82101bc69a49857835cb9387abe22d1eb57fa8 | |
| parent | 46743554f066ad045a1a2ff374740c22553a6541 (diff) | |
Ready for Applications/17.04
I have added support for cdrskin as an alternative to cdrecord/wodim and
restore wodim support as Kevin Kofler (Fedora packager) suggested.
And already fixed KDEBUG-365089, KDEBUG-367639, KDEBUG-360170,
KDEBUG-349160, KDEBUG-344392, KDEBUG-328529 and KDEBUG-257602 etc.
What's more, K3B users could not bear OLD and BUGGY v2.0.3 any more, so
I am ready for shipping K3B Applications/17.04, please give me some
advice, thanks a lot!
CCMAIL: aacid@kde.org
| -rw-r--r-- | CMakeLists.txt | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 986a6d0..ccab570 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,11 +5,17 @@ cmake_minimum_required(VERSION 2.8.12) find_package(ECM REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH "${ECM_MODULE_PATH}" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules") +# KDE Application Version, managed by release script +set (KDE_APPLICATIONS_VERSION_MAJOR "17") +set (KDE_APPLICATIONS_VERSION_MINOR "04") +set (KDE_APPLICATIONS_VERSION_MICRO "00") +set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") + +set (QT_MIN_VERSION "5.5.0") +set (KF5_MIN_VERSION "5.21.0") + ################## K3b version ################################ -set(K3B_VERSION_MAJOR 2) -set(K3B_VERSION_MINOR 10) -set(K3B_VERSION_RELEASE 0) -set(K3B_VERSION_STRING "${K3B_VERSION_MAJOR}.${K3B_VERSION_MINOR}.${K3B_VERSION_RELEASE}") +set(K3B_VERSION_STRING ${KDE_APPLICATIONS_VERSION}) # increase on BC breakage set(K3B_LIB_VERSION_MAJOR 7) @@ -52,8 +58,8 @@ include(GenerateExportHeader) include(ECMInstallIcons) include(ECMEnableSanitizers) -find_package(Qt5 REQUIRED COMPONENTS Core DBus Gui WebKitWidgets) -find_package(KF5 REQUIRED COMPONENTS Archive Config CoreAddons DocTools FileMetaData I18n IconThemes JobWidgets +find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core DBus Gui WebKitWidgets) +find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Archive Config CoreAddons DocTools FileMetaData I18n IconThemes JobWidgets KCMUtils KIO Notifications NewStuff NotifyConfig Service Solid WidgetsAddons XmlGui) add_definitions(-DQT_NO_URL_CAST_FROM_STRING) |