summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2015-09-17 07:49:57 +0200
committerMontel Laurent <[email protected]>2015-09-17 07:49:57 +0200
commit1449d63f908f7dea14e117d7da8b2a29c944f99c (patch)
tree5d3ec9632d2d963b009e3727c0cf6970b5912a30
parentbc02af4335f99c210fa3fec17bbe07ac0da9bb43 (diff)
Add more check
-rw-r--r--mailcommon/CMakeLists.txt17
-rw-r--r--mailimporter/CMakeLists.txt3
2 files changed, 10 insertions, 10 deletions
diff --git a/mailcommon/CMakeLists.txt b/mailcommon/CMakeLists.txt
index 84452fe..ef1b917 100644
--- a/mailcommon/CMakeLists.txt
+++ b/mailcommon/CMakeLists.txt
@@ -38,17 +38,16 @@ find_package(KF5Archive ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5ItemView ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5WindowSystem ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5XmlGui ${KF5_VERSION} CONFIG REQUIRED)
+find_package(KF5TemplateParser ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
+find_package(KF5MessageViewer ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
+find_package(KF5TemplateParser ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
+find_package(KF5Libkdepim ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
+find_package(KF5PimCommon ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
+find_package(KF5MessageComposer ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
+find_package(KF5MessageCore ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
+find_package(KF5MailImporter ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
-#target_link_libraries(KF5MailCommon
-#PUBLIC
-# KF5::MessageComposer
-# KF5::PimCommon
#PRIVATE
-# KF5::Libkdepim
-# KF5::MessageViewer
-# KF5::MailImporter
-# KF5::MessageCore
-# KF5::TemplateParser
# KF5::MailTransport
# Phonon::phonon4qt5
# KF5::KIOWidgets
diff --git a/mailimporter/CMakeLists.txt b/mailimporter/CMakeLists.txt
index faff03f..7b26caa 100644
--- a/mailimporter/CMakeLists.txt
+++ b/mailimporter/CMakeLists.txt
@@ -36,6 +36,7 @@ find_package(KF5Config ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5Archive ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5Libkdepim ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5AkonadiMime ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
+find_package(KF5AkonadiContact ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
ecm_setup_version(${KDEPIM_LIB_VERSION} VARIABLE_PREFIX MAILIMPORTER
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/mailimporter_version.h"
@@ -46,7 +47,7 @@ ecm_setup_version(${KDEPIM_LIB_VERSION} VARIABLE_PREFIX MAILIMPORTER
########### Targets ###########
add_definitions("-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII")
-
+remove_definitions( -DQT_NO_CAST_FROM_BYTEARRAY )
########### CMake Config Files ###########
set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5MailImporter")