[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [mailcommon] /: Merge branch 'Applications/16.04'
From:       Daniel_Vrátil <dvratil () kde ! org>
Date:       2016-05-04 0:00:10
Message-ID: E1axkEc-0003A3-VP () scm ! kde ! org
[Download RAW message or body]

Git commit d0a0beee0b81a18fec82ba376a98a98cb0858312 by Daniel Vr=C3=A1til.
Committed on 03/05/2016 at 23:59.
Pushed by dvratil into branch 'master'.

Merge branch 'Applications/16.04'

M  +1    -0    CMakeLists.txt
M  +13   -3    src/filter/autotests/CMakeLists.txt

http://commits.kde.org/mailcommon/d0a0beee0b81a18fec82ba376a98a98cb0858312

diff --cc CMakeLists.txt
index 8635600,b444887..c12ec47
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -18,20 -18,19 +18,21 @@@ include(KDEFrameworkCompilerSettings NO
  include(ECMQtDeclareLoggingCategory)
  include(ECMAddTests)
  =

 -set(MAILCOMMON_LIB_VERSION "5.2.1")
++
 +set(PIM_VERSION "5.2.54")
 +set(MAILCOMMON_LIB_VERSION ${PIM_VERSION})
  set(KF5_VERSION "5.19.0")
 -set(KDEPIMLIBS_LIB_VERSION "5.2.0")
 -set(MESSAGELIB_LIB_VERSION "5.2.0")
 +set(KDEPIMLIBS_LIB_VERSION "5.2.40")
 +set(MESSAGELIB_LIB_VERSION "5.2.46")
  set(QT_REQUIRED_VERSION "5.4.0")
 -set(KMIME_LIB_VERSION "5.2.0")
 -set(KMAILTRANSPORT_LIB_VERSION "5.2.0")
 -set(KLDAP_LIB_VERSION "5.2.0")
 -set(MAILIMPORTER_LIB_VERSION "5.2.0")
 -set(LIBKDEPIM_LIB_VERSION "5.2.0")
 -set(PIMCOMMON_LIB_VERSION "5.2.0")
 +set(KMIME_LIB_VERSION "5.2.40")
 +set(KMAILTRANSPORT_LIB_VERSION "5.2.40")
 +set(KLDAP_LIB_VERSION "5.2.40")
 +set(MAILIMPORTER_LIB_VERSION "5.2.40")
 +set(LIBKDEPIM_LIB_VERSION "5.2.40")
 +set(PIMCOMMON_LIB_VERSION "5.2.40")
  =

 -set(AKONADI_VERSION "5.2.0")
 +set(AKONADI_VERSION "5.2.40")
  =

  find_package(KF5Akonadi ${AKONADI_VERSION} CONFIG REQUIRED)
  find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test UiTo=
ols)
diff --cc src/filter/autotests/CMakeLists.txt
index 1065964,866b41b..be297c2
--- a/src/filter/autotests/CMakeLists.txt
+++ b/src/filter/autotests/CMakeLists.txt
@@@ -1,3 -1,9 +1,9 @@@
+ set(mailcommon_filter_test_LIBS Qt5::Test Qt5::Gui KF5::AkonadiCore KF5::=
AkonadiMime
+                                 KF5::Libkdepim KF5::MailCommon KF5::PimCo=
mmon Phonon::phonon4qt5
+                                 KF5::KIOWidgets KF5::IconThemes KF5::Temp=
lateParser
 -                                KF5::MailTransport
++                                KF5::MailTransport KF5::I18n
+ )
+ =

  macro(add_mailcommon_filter_test _name)
      ecm_add_test(${ARGN} =

          TEST_NAME ${_name}
[prev in list] [next in list] [prev in thread] [next in thread]