Move check code in resources directly

CMakeLists.txt

@@ -31,6 +31,11 @@ option(KDEPIM_ENTERPRISE_BUILD "Enable features specific to the enterprise branc
 # config-enterprise.h is needed for both ENTERPRISE_BUILD and BUILD_EVERYTHING
 configure_file(config-enterprise.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-enterprise.h )
 
+#Boost
+# Don't use BoostConfig.cmake
+set(Boost_NO_BOOST_CMAKE TRUE)
+find_package(Boost 1.34.0)
+set_package_properties(Boost PROPERTIES DESCRIPTION "Boost C++ Libraries" URL "http://www.boost.org" TYPE REQUIRED PURPOSE "Boost is required by Akonadi")
 
 add_subdirectory(resources)
 add_subdirectory(agents)
@@ -43,7 +48,7 @@ add_subdirectory(kioslave)
 #add_subdirectory(kcm)
 # We can't compile tray for the moment missing
 #add_subdirectory(tray)
-#add_subdirectory(migration)
+add_subdirectory(migration)
 if (QT_QTDECLARATIVE_FOUND)
   add_subdirectory(qml)
 endif ()

agents/CMakeLists.txt

@@ -28,7 +28,7 @@ endmacro()
 
 #add_subdirectory( maildispatcher )
 #add_subdirectory( newmailnotifier )
-#add_subdirectory( migration )
+add_subdirectory( migration )
 #add_subdirectory( invitations )
 
 install(FILES akonadinepomukfeederagent.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/akonadi/agents")

agents/migration/migrationscheduler.h

@@ -22,7 +22,7 @@
 #ifndef MIGRATIONSCHEDULER_H
 #define MIGRATIONSCHEDULER_H
 
-#include <migratorbase.h>
+#include "migratorbase.h"
 #include <QObject>
 #include <QAbstractItemModel>
 #include <QSharedPointer>

resources/CMakeLists.txt

@@ -31,15 +31,38 @@ find_package(KF5MailTransport ${KF5_VERSION} CONFIG REQUIRED)
 find_package(Xsltproc)
 set_package_properties(Xsltproc PROPERTIES DESCRIPTION "XSLT processor from libxslt" TYPE REQUIRED PURPOSE "Required to generate D-Bus interfaces for all Akonadi resources.")
 
+find_package(AccountsQt 1.11 QUIET CONFIG)
+set_package_properties(AccountsQt PROPERTIES DESCRIPTION "Qt bindings for accounts-sso" URL "https://code.google.com/p/accounts-sso/" TYPE OPTIONAL PURPOSE "Required to support AccountsQt in different resources")
+
+find_package(SignOnQt 8.56 QUIET CONFIG)
+set_package_properties(SignOnQt PROPERTIES DESCRIPTION "SignOn Qt bindings for accounts-sso" URL "https://code.google.com/p/accounts-sso/" TYPE OPTIONAL PURPOSE "Required to support SignOn in different resources")
+
+# Libkolab
+find_package(Libkolab 0.5 QUIET CONFIG)
+set_package_properties(Libkolab PROPERTIES DESCRIPTION "libkolab" URL "http://mirror.kolabsys.com/pub/releases" TYPE OPTIONAL PURPOSE "The Kolab Format libraries are required to build the Kolab Groupware Resource")
+
+# Libkolabxml
+find_package(Libkolabxml 1.0 QUIET CONFIG)
+set_package_properties(Libkolabxml PROPERTIES DESCRIPTION "Kolabxml" URL "http://mirror.kolabsys.com/pub/releases" TYPE OPTIONAL PURPOSE "The Kolab XML Format Schema Definitions Library is required to build the Kolab Groupware Resource")
+
+# Libkgapi2
+find_package(LibKGAPI2 1.9.81 QUIET CONFIG)
+set_package_properties(LibKGAPI2 PROPERTIES DESCRIPTION "KDE-based library for accessing various Google services" URL "https://projects.kde.org/libkgapi" TYPE OPTIONAL PURPOSE "LibKGAPI is required to build Akonadi resources to access Google Contacts, Calendars and Tasks")
+
+# Libkfbapi
+find_package(LibKFbAPI 1.0 QUIET CONFIG)
+set_package_properties(LibKFbAPI PROPERTIES DESCRIPTION "A library to access Facebook services" URL "http://projects.kde.org/libkfbapi" TYPE OPTIONAL PURPOSE "LibKFbAPI is required to build Akonadi resources to access Facebook's contacts, events, notes and posts" )
+
+if(LibKGAPI2_FOUND OR LibKFbAPI_FOUND)
+  find_package(QJSON)
+  set_package_properties(QJSON PROPERTIES DESCRIPTION "Qt library for handling JSON data" URL "http://qjson.sourceforge.net/" TYPE REQUIRED PURPOSE "Required to build the Google and Facebook resources")
+endif()
+
+
+
 #add_definitions( -DQT_NO_CAST_FROM_ASCII )
 #add_definitions( -DQT_NO_CAST_TO_ASCII )
 
-include_directories(
-  ${kdepim-runtime_SOURCE_DIR}/libkdepim-copy
-  ${CMAKE_CURRENT_SOURCE_DIR}/shared
-  ${CMAKE_CURRENT_BINARY_DIR}/shared
-)
-
 set( AKONADI_SINGLEFILERESOURCE_SHARED_SOURCES
   ${CMAKE_CURRENT_SOURCE_DIR}/shared/singlefileresourcebase.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/shared/singlefileresourceconfigdialogbase.cpp