summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Mollekopf <mollekopf@kolabsys.com>2013-10-01 13:02:38 (GMT)
committerChristian Mollekopf <mollekopf@kolabsys.com>2013-10-02 08:58:31 (GMT)
commita3b5b0e970dabf0578fcf442e52abf1e9bad6b66 (patch)
tree39b11f5b297468be6683b5d32325ad0272c84fe6
parentcedf32e806f1cd48afc27be36bd754c27db832d7 (diff)
downloadlibkolab-a3b5b0e970dabf0578fcf442e52abf1e9bad6b66.tar.gz
Do not declare the metatype with recent kdepimlibs as it has been defined there now.
-rw-r--r--CMakeLists.txt4
-rw-r--r--tests/testhelpers.h7
2 files changed, 10 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ae6c684..6f24001 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -73,8 +73,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 {