From b31e3f23db13956c417a545d644e7f5f69ed1df7 Mon Sep 17 00:00:00 2001 From: Kevin Funk Date: Thu, 31 Aug 2017 23:37:19 +0200 Subject: [PATCH 1/2] CMake: Use some more find_package(... CONFIG) --- generators/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/generators/CMakeLists.txt b/generators/CMakeLists.txt index 5eedf4ebb..97edab466 100644 --- a/generators/CMakeLists.txt +++ b/generators/CMakeLists.txt @@ -20,7 +20,7 @@ set_package_properties(LibSpectre PROPERTIES TYPE RECOMMENDED PURPOSE "Support for PS files in okular.") -find_package(KF5KExiv2) +find_package(KF5KExiv2 CONFIG) set_package_properties("LibKExiv2" PROPERTIES DESCRIPTION "Wrapper around Exiv2 library" URL "http://www.digikam.org/sharedlibs" @@ -34,7 +34,7 @@ set_package_properties("CHM" PROPERTIES TYPE RECOMMENDED PURPOSE "Support CHM files in okular.") -find_package(KF5KHtml) +find_package(KF5KHtml CONFIG) set_package_properties("KF5KHtml" PROPERTIES DESCRIPTION "HTML rendering library" TYPE RECOMMENDED @@ -82,7 +82,7 @@ set_package_properties("libepub" PROPERTIES TYPE RECOMMENDED PURPOSE "Support for EPub documents in Okular.") -find_package(QMobipocket "2") +find_package(QMobipocket "2" CONFIG) set_package_properties("libqmobipocket" PROPERTIES DESCRIPTION "A library for reading Mobipocket documents" URL "https://commits.kde.org/kdegraphics-mobipocket" From d1b0e6d68ac1b771aa1ad49f6e4dee42e272a07c Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Sat, 2 Sep 2017 11:32:08 +0200 Subject: [PATCH 2/2] GIT_SILENT Upgrade KDE Applications version to 17.08.1. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 178ea8a2a..d87952e88 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH}) # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "17") 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}") include(ECMInstallIcons)