From kde-commits Mon Apr 30 23:44:55 2018 From: =?utf-8?q?Daniel_Vr=C3=A1til?= Date: Mon, 30 Apr 2018 23:44:55 +0000 To: kde-commits Subject: [akregator] /: Merge branch 'Applications/18.04' Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=152513190802806 Git commit 7668f382dc3a9baa098c261f20641411221910d0 by Daniel Vr=C3=A1til. Committed on 30/04/2018 at 23:44. Pushed by dvratil into branch 'master'. Merge branch 'Applications/18.04' M +8 -8 CMakeLists.txt https://commits.kde.org/akregator/7668f382dc3a9baa098c261f20641411221910d0 diff --cc CMakeLists.txt index 3dd042ee,5e276aec..c8cdc60d --- a/CMakeLists.txt +++ b/CMakeLists.txt @@@ -38,16 -38,16 +38,16 @@@ set(KDEPIM_VERSION "${KDEPIM_VERSION_NU set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}") set(KDEPIM_LIB_SOVERSION "5") = -set(QT_REQUIRED_VERSION "5.8.0") +set(QT_REQUIRED_VERSION "5.9.0") = - set(KONTACTINTERFACE_LIB_VERSION "5.7.80") - set(KPIMTEXTEDIT_LIB_VERSION "5.7.80") - set(LIBGRANTLEETHEME_LIB_VERSION_LIB "5.7.80") - set(LIBKDEPIM_LIB_VERSION_LIB "5.7.80") - set(LIBKLEO_LIB_VERSION_LIB "5.7.80") - set(MESSAGELIB_LIB_VERSION_LIB "5.7.80") - set(PIMCOMMON_LIB_VERSION_LIB "5.7.80") - set(SYNDICATION_LIB_VERSION "5.7.80") + set(KONTACTINTERFACE_LIB_VERSION "5.8.1") + set(KPIMTEXTEDIT_LIB_VERSION "5.8.1") + set(LIBGRANTLEETHEME_LIB_VERSION_LIB "5.8.1") + set(LIBKDEPIM_LIB_VERSION_LIB "5.8.1") + set(LIBKLEO_LIB_VERSION_LIB "5.8.1") + set(MESSAGELIB_LIB_VERSION_LIB "5.8.1") + set(PIMCOMMON_LIB_VERSION_LIB "5.8.1") + set(SYNDICATION_LIB_VERSION "5.8.1") = find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test WebE= ngine WebEngineWidgets PrintSupport) find_package(Grantlee5 "5.1" CONFIG REQUIRED)