6 files changed, 91 insertions, 1 deletions
diff --git a/kresources/carddav/CMakeLists.txt b/kresources/carddav/CMakeLists.txt
new file mode 100644
index 000000000..d68e38246
--- /dev/null
+++ b/kresources/carddav/CMakeLists.txt
@@ -0,0 +1,54 @@
+#################################################
+#
+#  (C) 2010-2011 Serghei Amelian
+#  serghei (DOT) amelian (AT) gmail.com
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+include( ConfigureChecks.cmake )
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CARDDAV_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${CARDDAV_LIBRARY_DIRS}
+)
+
+
+##### other data ################################
+
+install(
+  FILES kabc_carddav.desktop
+  DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kabc )
+
+
+##### kabc_carddav (module) #####################
+
+tde_add_kpart( kabc_carddav AUTOMOC
+  SOURCES plugin.cpp
+  LINK kabc_carddav-shared
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### kabc_carddav (shared) #####################
+
+tde_add_library( kabc_carddav SHARED AUTOMOC
+  SOURCES
+    resource.cpp config.cpp configwidgets.cpp preferences.cpp job.cpp
+    reader.cpp writer.cpp prefsskel.kcfgc
+  VERSION 1.0.0
+  LINK kdepim-shared ${CARDDAV_LIBRARIES}
+  DESTINATION ${LIB_INSTALL_DIR}
+)
diff --git a/kresources/carddav/ConfigureChecks.cmake b/kresources/carddav/ConfigureChecks.cmake
new file mode 100644
index 000000000..62582fe9c
--- /dev/null
+++ b/kresources/carddav/ConfigureChecks.cmake
@@ -0,0 +1,30 @@
+#################################################
+#
+#  (C) 2010-2011 Serghei Amelian
+#  serghei (DOT) amelian (AT) gmail.com
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+# libcarddav
+pkg_search_module( CARDDAV libcarddav )
+if( CARDDAV_FOUND )
+  execute_process(
+    COMMAND pkg-config libcarddav --variable=pkgincludedir
+    OUTPUT_VARIABLE _incdir
+    RESULT_VARIABLE _result
+    OUTPUT_STRIP_TRAILING_WHITESPACE )
+  execute_process(
+    COMMAND pkg-config libcarddav --variable=pkglibdir
+    OUTPUT_VARIABLE _libdir
+    RESULT_VARIABLE _result
+    OUTPUT_STRIP_TRAILING_WHITESPACE )
+  list( APPEND CARDDAV_INCLUDE_DIRS ${_incdir} )
+  list( APPEND CARDDAV_LIBRARY_DIRS ${_libdir} )
+  list( APPEND CARDDAV_LIBRARIES carddav )
+else( )
+  tde_message_fatal( "libcarddav is requested, but was not found on your system" )
+endif( )
diff --git a/kresources/carddav/config.cpp b/kresources/carddav/config.cpp
index e8d7e25a0..337a4cdab 100644
--- a/kresources/carddav/config.cpp
+++ b/kresources/carddav/config.cpp
@@ -163,4 +163,6 @@ void ResourceCardDavConfig::setupUI() {
     vertical->addLayout(horizontal);
 }
 
+#include "config.moc"
+
 // EOF ========================================================================
diff --git a/kresources/carddav/configwidgets.cpp b/kresources/carddav/configwidgets.cpp
index fbec299ad..b159a0211 100644
--- a/kresources/carddav/configwidgets.cpp
+++ b/kresources/carddav/configwidgets.cpp
@@ -242,4 +242,6 @@ void CardDavSaveConfig::slotIntervalToggled( bool checked )
   }
 }
 
+#include "configwidgets.moc"
+
 // EOF ========================================================================
diff --git a/kresources/carddav/job.h b/kresources/carddav/job.h
index 75626abf3..52a04bc7a 100644
--- a/kresources/carddav/job.h
+++ b/kresources/carddav/job.h
@@ -22,7 +22,7 @@
 #include <tqapplication.h>
 
 extern "C" {
-    #include <libcarddav/carddav.h>
+    #include <carddav.h>
 }
 
 namespace KABC {
diff --git a/kresources/carddav/resource.cpp b/kresources/carddav/resource.cpp
index 53bbf034c..b8a2525ed 100644
--- a/kresources/carddav/resource.cpp
+++ b/kresources/carddav/resource.cpp
@@ -677,4 +677,6 @@ void ResourceCardDav::writingFinished() {
     }
 }
 
+#include "resource.moc"
+
 // EOF ========================================================================