summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-08-22 05:20:45 (GMT)
committerMontel Laurent <montel@kde.org>2016-08-22 05:21:39 (GMT)
commiteac4edf1721dd0e529f431c4ef24b4c78e5a6278 (patch)
tree46713c42bf348976aa70f5bd443a3ef769173bc2
parent879757a3ddebc09c9adf3d11838ea4d820c495bd (diff)
Fix merging
-rw-r--r--CMakeLists.txt59
1 files changed, 41 insertions, 18 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4902fa6..ea8ced6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,26 +40,49 @@ set(KPIMTEXTEDIT_LIB_VERSION "5.3.40")
set(LIBKDEPIM_LIB_VERSION "5.3.41")
set(LIBKLEO_LIB_VERSION "5.3.40")
set(PIMCOMMON_LIB_VERSION "5.3.41")
-=======
-set(AKONADIMIME_LIB_VERSION "5.3.1")
-set(QT_REQUIRED_VERSION "5.6.0")
+find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test Network PrintSupport WebEngine WebEngineWidgets WebKitWidgets)
+
+find_package(KF5Archive ${KF5_VERSION} CONFIG REQUIRED)
+find_package(KF5Codecs ${KF5_VERSION} CONFIG REQUIRED)
+find_package(KF5Completion ${KF5_VERSION} CONFIG REQUIRED)
+find_package(KF5Config ${KF5_VERSION} CONFIG REQUIRED)
+find_package(KF5ConfigWidgets ${KF5_VERSION} CONFIG REQUIRED)
+find_package(KF5I18n ${KF5_VERSION} CONFIG REQUIRED)
+find_package(KF5IconThemes ${KF5_VERSION} CONFIG REQUIRED)
+find_package(KF5ItemViews ${KF5_VERSION} CONFIG REQUIRED)
+find_package(KF5JobWidgets ${KF5_VERSION} CONFIG REQUIRED)
+find_package(KF5KIO ${KF5_VERSION} CONFIG REQUIRED)
+find_package(KF5Service ${KF5_VERSION} CONFIG REQUIRED)
+find_package(KF5Sonnet ${KF5_VERSION} CONFIG REQUIRED)
+find_package(KF5TextWidgets ${KF5_VERSION} CONFIG REQUIRED)
+find_package(KF5WebKit ${KF5_VERSION} CONFIG REQUIRED)
+find_package(KF5WidgetsAddons ${KF5_VERSION} CONFIG REQUIRED)
+find_package(KF5WindowSystem ${KF5_VERSION} CONFIG REQUIRED)
+find_package(KF5XmlGui ${KF5_VERSION} CONFIG REQUIRED)
+
+find_package(Grantlee5 "5.1" CONFIG REQUIRED)
+find_package(Gpgme REQUIRED)
+
+find_package(KF5Akonadi ${AKONADI_VERSION} CONFIG REQUIRED)
+find_package(KF5AkonadiMime ${AKONADIMIME_LIB_VERSION} CONFIG REQUIRED)
+find_package(KF5AkonadiNotes ${AKONADINOTES_LIB_VERSION} CONFIG REQUIRED)
+find_package(KF5Contacts ${KCONTACTS_LIB_VERSION} CONFIG REQUIRED)
+find_package(KF5FollowupReminder ${KDEPIM_APPS_LIB_VERSION} CONFIG REQUIRED)
+find_package(KF5GrantleeTheme ${GRANTLEETHEME_LIB_VERSION} CONFIG REQUIRED)
+find_package(KF5Gravatar ${GRAVATAR_LIB_VERSION} CONFIG REQUIRED)
+find_package(KF5IdentityManagement ${IDENTITYMANAGEMENT_LIB_VERSION} CONFIG REQUIRED)
+find_package(KF5KaddressbookGrantlee ${KDEPIM_APPS_LIB_VERSION} CONFIG REQUIRED)
+find_package(KF5Ldap ${KLDAP_LIB_VERSION} CONFIG REQUIRED)
+find_package(KF5Libkdepim ${LIBKDEPIM_LIB_VERSION} CONFIG REQUIRED)
+find_package(KF5Libkleo ${LIBKLEO_LIB_VERSION} CONFIG REQUIRED)
+find_package(KF5MailTransport ${KMAILTRANSPORT_LIB_VERSION} CONFIG REQUIRED)
+find_package(KF5Mbox ${KMBOX_LIB_VERSION} CONFIG REQUIRED)
+find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED)
+find_package(KF5PimCommon ${PIMCOMMON_LIB_VERSION} CONFIG REQUIRED)
+find_package(KF5PimTextEdit ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED)
+find_package(KF5SendLater ${KDEPIM_APPS_LIB_VERSION} CONFIG REQUIRED)
-set(AKONADI_VERSION "5.3.1")
-set(AKONADINOTES_LIB_VERSION "5.3.1")
-set(GRANTLEETHEME_LIB_VERSION "5.3.1")
-set(GRAVATAR_LIB_VERSION "5.3.1")
-set(IDENTITYMANAGEMENT_LIB_VERSION "5.3.1")
-set(KCONTACTS_LIB_VERSION "5.3.1")
-set(KDEPIM_APPS_LIB_VERSION "5.3.1")
-set(KLDAP_LIB_VERSION "5.3.1")
-set(KMAILTRANSPORT_LIB_VERSION "5.3.1")
-set(KMBOX_LIB_VERSION "5.3.1")
-set(KMIME_LIB_VERSION "5.3.1")
-set(KPIMTEXTEDIT_LIB_VERSION "5.3.1")
-set(LIBKDEPIM_LIB_VERSION "5.3.1")
-set(LIBKLEO_LIB_VERSION "5.3.1")
-set(PIMCOMMON_LIB_VERSION "5.3.1")
find_package(KF5AkonadiSearch "5.3.40" CONFIG REQUIRED)
set_package_properties(KF5AkonadiSearch PROPERTIES DESCRIPTION "The Akonadi Search libraries" URL "http://www.kde.org" TYPE REQUIRED PURPOSE "Provides search capabilities in KMail and Akonadi")