Branch 'libkolab-0.4' - CMakeLists.txt tests/testhelpers.h

[Christian Mollekopf]

 CMakeLists.txt      |    4 +++-
 tests/testhelpers.h |    7 +++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 47855ef38440c1427cd16d0e874aba269c6cf6e1
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Tue Oct 1 15:02:38 2013 +0200

    Do not declare the metatype with recent kdepimlibs as it has been defined there now.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fb22747..9f6eaa4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,8 +65,10 @@ find_package(SWIG)
 #Show summary of found libraries
 macro_display_feature_log()
 
-# add_definitions(-DKDEPIMLIBS_VERSION=0x${KdepimLibs_VERSION_MAJOR}0${KdepimLibs_VERSION_MINOR}${KDEPIMLIBS_VERSION_PATCH})
 # add_definitions( -DKDEPIMLIBS_VERSION=((${KdepimLibs_VERSION_MAJOR}<<16)|(${KdepimLibs_VERSION_MINOR}<<8)|(${KDEPIMLIBS_VERSION_PATCH})) )
+add_definitions( -DKDEPIMLIBS_VERSION_MAJOR=${KdepimLibs_VERSION_MAJOR} )
+add_definitions( -DKDEPIMLIBS_VERSION_MINOR=${KdepimLibs_VERSION_MINOR} )
+add_definitions( -DKDEPIMLIBS_VERSION_PATCH=${KdepimLibs_VERSION_PATCH} )
 
 if("${KdepimLibs_VERSION}" VERSION_GREATER "4.8.40" OR USE_LIBCALENDARING)
     add_definitions(-DKDEPIMLIBS_VERSION_DEVEL)
diff --git a/tests/testhelpers.h b/tests/testhelpers.h
index 84a2e46..546bc30 100644
--- a/tests/testhelpers.h
+++ b/tests/testhelpers.h
@@ -44,7 +44,14 @@ Q_DECLARE_METATYPE(std::vector<Kolab::FreebusyPeriod>);
 Q_DECLARE_METATYPE(KCalCore::Event);
 Q_DECLARE_METATYPE(KCalCore::Todo);
 Q_DECLARE_METATYPE(KCalCore::Journal);
+
+#if KDEPIMLIBS_VERSION_MAJOR <= 4
+#if KDEPIMLIBS_VERSION_MINOR <= 11
+#if KDEPIMLIBS_VERSION_PATCH < 52
 Q_DECLARE_METATYPE(KCalCore::Duration);
+#endif
+#endif
+#endif
 
 namespace QTest {