Commit e661cd2b authored by Laurent Montel's avatar Laurent Montel 😁

Make it compile

parent cf8e7690
......@@ -79,6 +79,7 @@ include(FeatureSummary)
include(KDEInstallDirs)
include(KDECMakeSettings)
include(KDEFrameworkCompilerSettings)
include(ECMInstallIcons)
set(KF5_VERSION "4.100.0")
set(QT_REQUIRED_VERSION "5.2.0")
......@@ -94,6 +95,7 @@ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Widgets Test Declarative)
find_package(Qt5WebKitWidgets ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE)
set(AkonadiServer_MIN_VERSION "1.70.41")
find_package(Akonadi ${AkonadiServer_MIN_VERSION} CONFIG REQUIRED)
......@@ -121,6 +123,8 @@ find_package(KF5CalendarUtils ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5MicroBlog ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5PimUtils ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5AkonadiMime ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5Mbox ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5PimTextEdit ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
......
cmake_minimum_required(VERSION 2.8.12)
project(accountwizard)
# ECM setup
find_package(ECM 0.0.14 CONFIG REQUIRED)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
########### Find packages ###########
if ("${CMAKE_SOURCE_DIR}" STREQUAL "${accountwizard_SOURCE_DIR}")
find_package(ECM 0.0.14 CONFIG REQUIRED)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
include(ECMPackageConfigHelpers)
include(ECMSetupVersion)
include(FeatureSummary)
include(KDEInstallDirs)
include(KDECMakeSettings)
include(KDEFrameworkCompilerSettings)
# FIXME: Do we want the same versions in kdepimlibs and kf5?
set(KF5_VERSION "4.100.0")
set(QT_REQUIRED_VERSION "5.2.0")
set(KDEPIMLIBS_LIB_VERSION "4.70.0")
# KF5 package
find_package(KF5KIO ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5KDELibs4Support ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5WidgetsAddons ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5Wallet ${KF5_VERSION} CONFIG REQUIRED)
# KdepimLibs package
find_package(KF5Akonadi ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5MailTransport ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5PimUtils ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5PimIdentities ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
endif()
# Qt5 package
find_package(Qt5UiTools ${QT_REQUIRED_VERSION} CONFIG REQUIRED)
find_package(KF5Kross ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5NewStuff ${KF5_VERSION} CONFIG REQUIRED)
include(ECMPackageConfigHelpers)
include(ECMSetupVersion)
include(FeatureSummary)
include(KDEInstallDirs)
include(KDECMakeSettings)
include(KDEFrameworkCompilerSettings)
add_definitions( -DQT_NO_CAST_FROM_ASCII )
add_definitions( -DQT_NO_CAST_TO_ASCII )
......@@ -39,34 +68,6 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${accountwizard_SOURCE_DIR}")
endif()
########### Find packages ###########
#if ("${CMAKE_SOURCE_DIR}" STREQUAL "${accountwizard_SOURCE_DIR}")
# FIXME: Do we want the same versions in kdepimlibs and kf5?
set(KF5_VERSION "4.100.0")
set(QT_REQUIRED_VERSION "5.2.0")
set(KDEPIMLIBS_LIB_VERSION "4.70.0")
# KF5 package
find_package(KF5KIO ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5KDELibs4Support ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5WidgetsAddons ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5Wallet ${KF5_VERSION} CONFIG REQUIRED)
# KdepimLibs package
find_package(KF5Akonadi ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5MailTransport ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5PimUtils ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5PimIdentities ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
# Qt5 package
find_package(Qt5UiTools ${QT_REQUIRED_VERSION} CONFIG REQUIRED)
#endif()
find_package(KF5Kross ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5NewStuff ${KF5_VERSION} CONFIG REQUIRED)
set(accountwizard_srcs
dialog.cpp
typepage.cpp
......
project(agents)
cmake_minimum_required(VERSION 2.8.12)
find_package(ECM 0.0.14 CONFIG REQUIRED)
set(CMAKE_MODULE_PATH ${agents_SOURCE_DIR}/cmake ${ECM_MODULE_PATH})
include(ECMPackageConfigHelpers)
include(ECMSetupVersion)
include(FeatureSummary)
include(KDEInstallDirs)
include(KDECMakeSettings)
include(KDEFrameworkCompilerSettings)
add_definitions( -DQT_NO_CAST_FROM_ASCII )
add_definitions( -DQT_NO_CAST_TO_ASCII )
if ("${CMAKE_SOURCE_DIR}" STREQUAL "${agents_SOURCE_DIR}")
find_package(ECM 0.0.14 CONFIG REQUIRED)
set(CMAKE_MODULE_PATH ${agents_SOURCE_DIR}/cmake ${ECM_MODULE_PATH})
include(ECMPackageConfigHelpers)
include(ECMSetupVersion)
include(FeatureSummary)
include(KDEInstallDirs)
include(KDECMakeSettings)
include(KDEFrameworkCompilerSettings)
set(KDEPIMLIBS_LIB_VERSION "4.70.0")
set(KF5_VERSION "4.100.0")
set(QT_REQUIRED_VERSION "5.2.0")
......
project(kioslave)
cmake_minimum_required(VERSION 2.8.12)
if ("${CMAKE_SOURCE_DIR}" STREQUAL "${kioslave_SOURCE_DIR}")
find_package(ECM 0.0.14 CONFIG REQUIRED)
set(CMAKE_MODULE_PATH ${resources_SOURCE_DIR}/cmake ${ECM_MODULE_PATH})
set(CMAKE_MODULE_PATH ${resources_SOURCE_DIR}/cmake ${ECM_MODULE_PATH})
include(ECMPackageConfigHelpers)
include(ECMSetupVersion)
include(FeatureSummary)
include(KDEInstallDirs)
include(KDECMakeSettings)
include(KDEFrameworkCompilerSettings)
include(ECMPackageConfigHelpers)
include(ECMSetupVersion)
include(FeatureSummary)
include(KDEInstallDirs)
include(KDECMakeSettings)
include(KDEFrameworkCompilerSettings)
set(KDEPIMLIBS_LIB_VERSION "4.70.0")
set(KF5_VERSION "4.100.0")
set(QT_REQUIRED_VERSION "5.2.0")
set(KDEPIMLIBS_LIB_VERSION "4.70.0")
set(KF5_VERSION "4.100.0")
set(QT_REQUIRED_VERSION "5.2.0")
find_package(KF5KIO ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5Akonadi ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5ItemModels ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5KDELibs4Support ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5KIO ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5Akonadi ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5ItemModels ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5KDELibs4Support ${KF5_VERSION} CONFIG REQUIRED)
endif()
set(kio_akonadi_SRCS akonadislave.cpp )
......@@ -44,7 +47,7 @@ install(TARGETS kio_akonadi DESTINATION ${PLUGIN_INSTALL_DIR} )
install( FILES akonadi.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
if ("${CMAKE_BINARY_DIR}" STREQUAL "${kioslave_BINARY_DIR}")
if ("${CMAKE_SOURCE_DIR}" STREQUAL "${kioslave_SOURCE_DIR}")
feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
endif()
......
project(migration)
kde_enable_exceptions()
find_package(ECM 0.0.14 CONFIG REQUIRED)
set(CMAKE_MODULE_PATH ${migration_SOURCE_DIR}/cmake ${ECM_MODULE_PATH})
include(ECMPackageConfigHelpers)
include(ECMSetupVersion)
include(FeatureSummary)
include(KDEInstallDirs)
include(KDECMakeSettings)
include(KDEFrameworkCompilerSettings)
set(KDEPIMLIBS_LIB_VERSION "4.70.0")
set(KF5_VERSION "4.100.0")
set(QT_REQUIRED_VERSION "5.2.0")
find_package(KF5Config ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5KDELibs4Support ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5Akonadi ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5Mime ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5Abc ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5MailTransport ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5Mbox ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5PimUtils ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5AkonadiMime ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5PimTextEdit ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
if (0)
find_package(ECM 0.0.14 CONFIG REQUIRED)
set(CMAKE_MODULE_PATH ${migration_SOURCE_DIR}/cmake ${ECM_MODULE_PATH})
include(ECMPackageConfigHelpers)
include(ECMSetupVersion)
include(FeatureSummary)
include(KDEInstallDirs)
include(KDECMakeSettings)
include(KDEFrameworkCompilerSettings)
set(KDEPIMLIBS_LIB_VERSION "4.70.0")
set(KF5_VERSION "4.100.0")
set(QT_REQUIRED_VERSION "5.2.0")
find_package(KF5Config ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5KDELibs4Support ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5Akonadi ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5Mime ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5Abc ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5MailTransport ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5Mbox ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5PimUtils ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5AkonadiMime ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5PimTextEdit ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
endif()
add_definitions( -DQT_NO_CAST_FROM_ASCII )
add_definitions( -DQT_NO_CAST_TO_ASCII )
......@@ -48,8 +49,9 @@ set( MIGRATION_AKONADI_SHARED_SOURCES
)
#add_subdirectory( kmail )
add_subdirectory( kmail )
add_subdirectory( kaddressbook )
#add_subdirectory( kjots )
add_subdirectory( kjots )
add_subdirectory( gid )
#TODO port away kcal
#add_subdirectory( knotes )
......@@ -41,7 +41,7 @@
#include <AkonadiCore/CollectionFetchJob>
#include <AkonadiCore/resourcesynchronizationjob.h>
#include <KPIMTextEdit/textutils.h>
#include <kpimtextedit/textutils.h>
#include "maildirsettings.h"
......@@ -105,7 +105,7 @@ void KJotsMigrator::notesResourceCreated( KJob *job )
QDBusPendingReply<void> response = iface->setPath( KGlobal::dirs()->localxdgdatadir() + QLatin1String("/notes/") + KRandom::randomString( 10 ) );
// make sure the config is saved
iface->writeConfig();
iface->save();
instance.reconfigure();
m_resourceIdentifier = instance.identifier();
......
......@@ -123,7 +123,7 @@ void ImapCacheAdapter::Private::createResourceResult( KJob *job )
iface->setPath( mStore->path() );
// make sure the config is saved
iface->writeConfig();
iface->save();
delete iface;
instance.reconfigure();
......
......@@ -210,7 +210,7 @@ void ImapCacheLocalImporter::Private::configureResource()
iface->setPath( pathInfo.absoluteFilePath() );
// make sure the config is saved
iface->writeConfig();
iface->save();
mResource.setName( i18nc( "@title account name", "Local Copies of %1", mAccountName ) );
mResource.reconfigure();
......
......@@ -466,7 +466,7 @@ void KMailMigrator::migrateInstanceTrashFolder()
if ( value != -1 ) {
iface->setTrashCollection( value );
// make sure the config is saved
iface->writeConfig();
iface->save();
instance.reconfigure();
}
}
......@@ -477,7 +477,7 @@ void KMailMigrator::migrateInstanceTrashFolder()
if ( value != -1 ) {
iface->setTargetCollection( value );
// make sure the config is saved
iface->writeConfig();
iface->save();
instance.reconfigure();
}
}
......@@ -845,7 +845,7 @@ void KMailMigrator::pop3AccountCreated( KJob *job )
iface->setSeenUidTimeList( popFilterGroup.readEntry( "seenUidTimeList", QList<int>() ) );
// make sure the config is saved
iface->writeConfig();
iface->save();
//Info: there is trash item in config which is default and we can't configure it => don't look at it in pop account.
config.deleteEntry( "trash" );
......@@ -893,7 +893,7 @@ void KMailMigrator::mboxAccountCreated( KJob *job )
iface->setLockfileMethod( MboxNone );
// make sure the config is saved
iface->writeConfig();
iface->save();
// check-exclude in Account section means that this account should not be included
// in manual checks. In KMail UI this is called "Include in manual checks"
......@@ -945,7 +945,7 @@ void KMailMigrator::maildirAccountCreated( KJob *job )
iface->setPath( config.readEntry( "Location" ) );
// make sure the config is saved
iface->writeConfig();
iface->save();
// check-exclude in Account section means that this account should not be included
// in manual checks. In KMail UI this is called "Include in manual checks"
......@@ -1070,7 +1070,7 @@ void KMailMigrator::localFoldersMigrationFinished( const AgentInstance &instance
iface->setPath( mLocalMaildirPath );
// make sure the config is saved
iface->writeConfig();
iface->save();
AgentInstance resource = instance;
resource.reconfigure();
......@@ -1205,7 +1205,7 @@ void KMailMigrator::imapFoldersMigrationFinished( const AgentInstance &instance,
}
// make sure the config is saved
iface->writeConfig();
iface->save();
AgentInstance resource = instance;
resource.reconfigure();
......
project(plugins)
add_definitions( -DQT_NO_CAST_FROM_ASCII )
add_definitions( -DQT_NO_CAST_TO_ASCII )
......@@ -10,22 +11,26 @@ include_directories(
kde_enable_exceptions()
set(KDEPIMLIBS_LIB_VERSION "4.70.0")
find_package(Qt5DBus ${KF5_VERSION} CONFIG REQUIRED)
if ("${CMAKE_SOURCE_DIR}" STREQUAL "${plugins_SOURCE_DIR}")
find_package(KF5KDELibs4Support ${KF5_VERSION} CONFIG REQUIRED)
set(KDEPIMLIBS_LIB_VERSION "4.70.0")
find_package(Qt5DBus ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5Akonadi ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5Mime ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5Abc ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5AlarmCalendar ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5CalendarCore ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5CalendarUtils ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5AkonadiContact ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5MicroBlog ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5AkonadiMime ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5KDELibs4Support ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5Akonadi ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5Mime ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5Abc ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5AlarmCalendar ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5CalendarCore ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5CalendarUtils ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5AkonadiContact ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5MicroBlog ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5AkonadiMime ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
endif()
#REACTIVATE IT
#set(akonadi_serializer_addressee_PART_SRCS akonadi_serializer_addressee.cpp )
......@@ -83,3 +88,8 @@ install( FILES
akonadi_serializer_kalarm.desktop
DESTINATION ${DATA_INSTALL_DIR}/akonadi/plugins/serializer)
if ("${CMAKE_BINARY_DIR}" STREQUAL "${plugins_BINARY_DIR}")
feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
endif()
project(resources)
cmake_minimum_required(VERSION 2.8.12)
find_package(ECM 0.0.14 CONFIG REQUIRED)
set(CMAKE_MODULE_PATH ${resources_SOURCE_DIR}/cmake ${ECM_MODULE_PATH})
include(ECMPackageConfigHelpers)
include(ECMSetupVersion)
include(FeatureSummary)
include(KDEInstallDirs)
include(KDECMakeSettings)
include(KDEFrameworkCompilerSettings)
include(ECMInstallIcons)
#if ("${CMAKE_SOURCE_DIR}" STREQUAL "${resources_SOURCE_DIR}")
if ("${CMAKE_SOURCE_DIR}" STREQUAL "${resources_SOURCE_DIR}")
find_package(ECM 0.0.14 CONFIG REQUIRED)
set(CMAKE_MODULE_PATH ${resources_SOURCE_DIR}/cmake ${ECM_MODULE_PATH})
include(ECMPackageConfigHelpers)
include(ECMSetupVersion)
include(FeatureSummary)
include(KDEInstallDirs)
include(KDECMakeSettings)
include(KDEFrameworkCompilerSettings)
include(ECMInstallIcons)
set(KF5_VERSION "4.100.0")
set(QT_REQUIRED_VERSION "5.2.0")
......@@ -38,7 +38,7 @@ include(ECMInstallIcons)
find_package(KF5MailTransport ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5Mime ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5AkonadiContact ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
#endif()
endif()
find_package(KF5Imap ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
......@@ -120,7 +120,7 @@ add_subdirectory( kdeaccounts )
add_subdirectory( localbookmarks )
#add_subdirectory( maildir )
add_subdirectory( maildir )
add_subdirectory( openxchange )
add_subdirectory( pop3 )
......@@ -136,7 +136,7 @@ add_subdirectory( pop3 )
add_subdirectory( shared )
add_subdirectory( birthdays )
#add_subdirectory( mixedmaildir )
add_subdirectory( mixedmaildir )
add_subdirectory( mailtransport_dummy )
#FIX LINKING add_subdirectory( mbox )
add_subdirectory( nntp )
......
......@@ -9,30 +9,30 @@ add_subdirectory(libmaildir)
########### next target ###############
#REACTIVATE IT
#set( maildirresource_SRCS
# maildirresource.cpp
# configdialog.cpp
# main.cpp
# retrieveitemsjob.cpp
#)
set( maildirresource_SRCS
maildirresource.cpp
configdialog.cpp
main.cpp
retrieveitemsjob.cpp
)
#install( FILES maildirresource.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/akonadi/agents" )
install( FILES maildirresource.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/akonadi/agents" )
#ki18n_wrap_ui(maildirresource_SRCS settings.ui)
ki18n_wrap_ui(maildirresource_SRCS settings.ui)
#kconfig_add_kcfg_files(maildirresource_SRCS settings.kcfgc)
kconfig_add_kcfg_files(maildirresource_SRCS settings.kcfgc)
#kcfg_generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/maildirresource.kcfg org.kde.Akonadi.Maildir.Settings)
kcfg_generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/maildirresource.kcfg org.kde.Akonadi.Maildir.Settings)
#qt5_add_dbus_adaptor(maildirresource_SRCS
# ${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.Maildir.Settings.xml settings.h Akonadi_Maildir_Resource::MaildirSettings maildirsettingsadaptor MaildirSettingsAdaptor
#)
qt5_add_dbus_adaptor(maildirresource_SRCS
${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.Maildir.Settings.xml settings.h Akonadi_Maildir_Resource::MaildirSettings maildirsettingsadaptor MaildirSettingsAdaptor
)
#add_library(akonadi_maildir_resource MODULE ${maildirresource_SRCS})
add_library(akonadi_maildir_resource MODULE ${maildirresource_SRCS})
#target_link_libraries(akonadi_maildir_resource KF5::AkonadiCore KF5::AkonadiMime maildir KF5::KIOCore KF5::Mime folderarchivesettings KF5::AkonadiAgentBase)
target_link_libraries(akonadi_maildir_resource KF5::AkonadiCore KF5::AkonadiMime maildir KF5::KIOCore KF5::Mime folderarchivesettings KF5::AkonadiAgentBase)
install(TARGETS akonadi_maildir_resource DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.Maildir.Settings.xml
DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
#install(TARGETS akonadi_maildir_resource DESTINATION ${PLUGIN_INSTALL_DIR})
#install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.Maildir.Settings.xml
# DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
......@@ -14,6 +14,10 @@ include_directories(
kde_enable_exceptions()
add_subdirectory(kmindexreader)
#REACTIVATE IT
if (FALSE)
add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5254) # TODO get our own debug area
########### next target ###############
......@@ -68,3 +72,4 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.MixedMaildir.Settings.
if (KDE4_BUILD_TESTS)
add_subdirectory( tests )
endif ()
endif()
......@@ -28,7 +28,7 @@
#include <KDebug>
#include <kde_file.h>
#include <kmime/messagestatus.h>
#include <akonadi/kmime/messagestatus.h>
using Akonadi::MessageStatus;
#include <QFile>
......
......@@ -37,7 +37,7 @@
#include "libmaildir/maildir.h"
#include <KMbox/mbox.h>
#include <kmbox/mbox.h>
#include <kmime/kmime_message.h>
#include <Akonadi/KMime/MessageParts>
......@@ -45,7 +45,7 @@
#include <AkonadiCore/cachepolicy.h>
#include <AkonadiCore/itemfetchscope.h>
#include <KPIMUtils/kfileio.h>
#include <kpimutils/kfileio.h>
#include <KLocalizedString>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment