Merge branch 'master' into multiple_apis
Some checks failed
continuous-integration/drone/push Build is failing

This commit is contained in:
Luca Beltrame 2019-06-08 16:16:10 +02:00
commit 58003911a4
Signed by: einar
GPG key ID: 8DF631FD021DB0C5
4 changed files with 14 additions and 8 deletions

View file

@ -1,5 +1,5 @@
project(danbooru_client)
cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
set(danbooru_client_VERSION_MAJOR 0)
set(danbooru_client_VERSION_MINOR 3)
@ -44,6 +44,7 @@ find_package(KF5 ${KF5_VERSION} REQUIRED
CoreAddons # Caches
TextWidgets # Spin boxes
GuiAddons # Image cache
Config # Configuration
Completion # KComboBox
XmlGui # User interface
ConfigWidgets # Handling of configuration
@ -57,7 +58,7 @@ find_package(KF5 ${KF5_VERSION} REQUIRED
include(ECMInstallIcons)
include(KDEInstallDirs)
include(KDECompilerSettings)
include(KDECompilerSettings NO_POLICY_SCOPE)
include(KDECMakeSettings)
include(FeatureSummary)