summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Mollekopf <mollekopf@kolabsys.com>2016-04-06 17:24:40 +0200
committerChristian Mollekopf <mollekopf@kolabsys.com>2016-04-06 17:24:40 +0200
commit782a8883fa1ded58ea484bb0de6f6bf903b6e8b5 (patch)
tree5333fecfcfe99f927180735ebe022a71f6ca8220
parent3515557707a84cbcc2d9d2a8971449c635db7ada (diff)
parent4a0985c11ae4ee214036fb650bf0bd0205801018 (diff)
downloadlibkolab-782a8883fa1ded58ea484bb0de6f6bf903b6e8b5.tar.gz
Merge branch 'master' of https://git.kolab.org/diffusion/LK/libkolab
-rw-r--r--CMakeLists.txt4
-rw-r--r--kolab_export.h1
2 files changed, 3 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 06ed7be..07669d0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -59,9 +59,9 @@ include(MacroLogFeature)
find_package(Libkolabxml 1.1 REQUIRED)
macro_log_feature(Libkolabxml_FOUND "Libkolabxml" "Kolab XML Format 3 serializing library" "http://git.kolab.org/libkolabxml/" TRUE "1.0" "Required for reading/writing Kolab XML Objects")
-find_package(Qt4 4.6.0 REQUIRED)
-
if (USE_LIBCALENDARING)
+ find_package(Qt4 4.6.0 REQUIRED)
+
find_package(Libcalendaring)
macro_log_feature(LIBCALENDARING_FOUND "Libcalendaring" "KDE Calendaring-Dependencies Library" "http://git.kolab.org/libcalendaring/" TRUE "" "Required if KDE libraries are not available.")
else()
diff --git a/kolab_export.h b/kolab_export.h
index d001b64..5ca06f0 100644
--- a/kolab_export.h
+++ b/kolab_export.h
@@ -25,6 +25,7 @@
//Workaround for qt not defining Q_DECL_IMPORT as it should
#if defined(Q_OS_LINUX)
+# undef Q_DECL_IMPORT
# define Q_DECL_IMPORT __attribute__((visibility("default")))
#endif