Commit 9955374b authored by Andreas Holzammer's avatar Andreas Holzammer
Browse files

- change the maildispatcher to executable again

svn path=/trunk/KDE/kdepim/runtime/; revision=1189470
parent 5ebefbb5
macro(kdepim_add_agent _target)
if(KDEPIM_BUILD_AGENTS_AS_PLUGINS)
add_definitions(-DKDEPIM_PLUGIN_AGENT)
kde4_add_plugin(${_target} ${ARGN})
install( TARGETS ${_target} DESTINATION ${PLUGIN_INSTALL_DIR}/ )
else(KDEPIM_BUILD_AGENTS_AS_PLUGINS)
kde4_add_executable(${_target} ${ARGN})
install(TARGETS ${_target} ${INSTALL_TARGETS_DEFAULT_ARGS})
endif(KDEPIM_BUILD_AGENTS_AS_PLUGINS)
endmacro(kdepim_add_agent)
add_subdirectory( maildispatcher )
if(NOT WINCE)
add_subdirectory( invitations )
......
......@@ -18,7 +18,7 @@ qt4_add_dbus_adaptor( maildispatcheragent_SRCS
org.freedesktop.Akonadi.MailDispatcherAgent.xml maildispatcheragent.h MailDispatcherAgent
)
kde4_add_plugin(akonadi_maildispatcher_agent ${maildispatcheragent_SRCS})
kdepim_add_agent(akonadi_maildispatcher_agent ${maildispatcheragent_SRCS})
if (Q_WS_MAC)
set_target_properties(akonadi_maildispatcher_agent PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/../Info.plist.template)
......@@ -28,6 +28,5 @@ endif (Q_WS_MAC)
target_link_libraries(akonadi_maildispatcher_agent ${KDEPIMLIBS_AKONADI_LIBS} ${KDEPIMLIBS_AKONADI_KMIME_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} ${KDEPIMLIBS_KMIME_LIBS} ${KDEPIMLIBS_MAILTRANSPORT_LIBS} )
install( TARGETS akonadi_maildispatcher_agent DESTINATION ${PLUGIN_INSTALL_DIR}/ )
install( FILES maildispatcheragent.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/akonadi/agents" )
install( FILES akonadi_maildispatcher_agent.notifyrc DESTINATION "${DATA_INSTALL_DIR}/akonadi_maildispatcher_agent" )
......@@ -305,8 +305,11 @@ void MailDispatcherAgent::Private::emitStatusReady()
}
}
#ifdef KDEPIM_PLUGIN_AGENT
AKONADI_AGENT_FACTORY( MailDispatcherAgent, akonadi_maildispatcher_agent )
#else
AKONADI_AGENT_MAIN( MailDispatcherAgent)
#endif
#include "maildispatcheragent.moc"
......@@ -36,4 +36,3 @@ Icon=mail-folder-outbox
X-Akonadi-MimeTypes=message/rfc822
X-Akonadi-Capabilities=Unique,Autostart,NoConfig
X-Akonadi-Identifier=akonadi_maildispatcher_agent
X-Akonadi-LaunchMethod=AgentLauncher
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