diff --git a/autotests/libs/testresource/CMakeLists.txt b/autotests/libs/testresource/CMakeLists.txt index df4008612..abc08767c 100644 --- a/autotests/libs/testresource/CMakeLists.txt +++ b/autotests/libs/testresource/CMakeLists.txt @@ -1,48 +1,43 @@ include_directories( ${Boost_INCLUDE_DIR} ) include(${CMAKE_SOURCE_DIR}/KF5AkonadiMacros.cmake) kde_enable_exceptions() remove_definitions(-DTRANSLATION_DOMAIN=\"libakonadi5\") add_definitions(-DTRANSLATION_DOMAIN=\"akonadi_knut_resource\") # Disabled for now, resourcetester remained in kdepim-runtime #add_subdirectory( tests ) set( knutresource_SRCS knutresource.cpp) ecm_qt_declare_logging_category(knutresource_SRCS HEADER knutresource_debug.h IDENTIFIER KNUTRESOURCE_LOG CATEGORY_NAME org.kde.pim.knut) kconfig_add_kcfg_files(knutresource_SRCS settings.kcfgc) kcfg_generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/knutresource.kcfg org.kde.Akonadi.Knut.Settings) qt5_add_dbus_adaptor(knutresource_SRCS ${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.Knut.Settings.xml settings.h KnutSettings ) add_executable(akonadi_knut_resource ${knutresource_SRCS}) - -if (APPLE) - set_target_properties(akonadi_knut_resource PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.template) - set_target_properties(akonadi_knut_resource PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.Akonadi.Knut") - set_target_properties(akonadi_knut_resource PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDE Akonadi Knut Resource") -endif () +set_target_properties(akonadi_knut_resource PROPERTIES MACOSX_BUNDLE FALSE) target_link_libraries(akonadi_knut_resource KF5::AkonadiXml KF5::AkonadiCore KF5::KIOCore KF5::AkonadiAgentBase KF5::DBusAddons Qt5::Xml KF5::I18n ) install( TARGETS akonadi_knut_resource ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) install( FILES knutresource.desktop DESTINATION "${KDE_INSTALL_DATAROOTDIR}/akonadi/agents" ) install( FILES knut-template.xml DESTINATION ${KDE_INSTALL_DATADIR_KF5}/akonadi_knut_resource/ ) diff --git a/src/agentserver/CMakeLists.txt b/src/agentserver/CMakeLists.txt index d2f55add9..c577c74a6 100644 --- a/src/agentserver/CMakeLists.txt +++ b/src/agentserver/CMakeLists.txt @@ -1,53 +1,44 @@ # Agent server set(akonadi_agent_server_srcs agentpluginloader.cpp agentserver.cpp agentthread.cpp main.cpp ) ecm_qt_declare_logging_category(akonadi_agent_server_srcs HEADER akonadiagentserver_debug.h IDENTIFIER AKONADIAGENTSERVER_LOG CATEGORY_NAME org.kde.pim.akonadiagentserver) add_executable(akonadi_agent_server ${akonadi_agent_server_srcs}) +set_target_properties(akonadi_agent_server PROPERTIES MACOSX_BUNDLE FALSE) target_link_libraries(akonadi_agent_server akonadi_shared KF5AkonadiPrivate Qt5::Core Qt5::DBus Qt5::Widgets ) # Agent plugin launcher set(akonadi_agent_launcher_SRCS agentpluginloader.cpp agentlauncher.cpp akonadiagentserver_debug.cpp ) -add_executable(akonadi_agent_launcher MACOSX_BUNDLE ${akonadi_agent_launcher_SRCS}) +add_executable(akonadi_agent_launcher ${akonadi_agent_launcher_SRCS}) +set_target_properties(akonadi_agent_launcher PROPERTIES MACOSX_BUNDLE FALSE) target_link_libraries(akonadi_agent_launcher akonadi_shared KF5AkonadiPrivate Qt5::Core Qt5::Widgets ) -if(Q_WS_MAC) - set_target_properties(akonadi_agent_launcher PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/../Info.plist.template) - set_target_properties(akonadi_agent_launcher PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.Akonadi.agentlauncher") - set_target_properties(akonadi_agent_launcher PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "Akonadi Agent Launcher") -endif() - # Install both helper apps. -if(Q_WS_MAC) - install(TARGETS akonadi_agent_launcher - DESTINATION ${AKONADI_BUNDLE_PATH}) -else() - install(TARGETS akonadi_agent_launcher +install(TARGETS akonadi_agent_launcher DESTINATION ${BIN_INSTALL_DIR}) -endif() install(TARGETS akonadi_agent_server ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/src/akonadicontrol/CMakeLists.txt b/src/akonadicontrol/CMakeLists.txt index a62ea936e..cac9e3dab 100644 --- a/src/akonadicontrol/CMakeLists.txt +++ b/src/akonadicontrol/CMakeLists.txt @@ -1,57 +1,58 @@ include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) ########### next target ############### set(control_SRCS agenttype.cpp agentinstance.cpp agentprocessinstance.cpp agentthreadinstance.cpp agentmanager.cpp controlmanager.cpp main.cpp processcontrol.cpp ) ecm_qt_declare_logging_category(control_SRCS HEADER akonadicontrol_debug.h IDENTIFIER AKONADICONTROL_LOG CATEGORY_NAME org.kde.pim.akonadicontrol) qt5_add_dbus_adaptor(control_SRCS ${Akonadi_SOURCE_DIR}/src/interfaces/org.freedesktop.Akonadi.AgentManager.xml agentmanager.h AgentManager) qt5_add_dbus_adaptor(control_SRCS ${Akonadi_SOURCE_DIR}/src/interfaces/org.freedesktop.Akonadi.ControlManager.xml controlmanager.h ControlManager) qt5_add_dbus_adaptor(control_SRCS ${Akonadi_SOURCE_DIR}/src/interfaces/org.freedesktop.Akonadi.AgentManagerInternal.xml agentmanager.h AgentManager) qt5_add_dbus_interfaces(control_SRCS ${Akonadi_SOURCE_DIR}/src/interfaces/org.freedesktop.Akonadi.Agent.Control.xml ${Akonadi_SOURCE_DIR}/src/interfaces/org.freedesktop.Akonadi.Agent.Status.xml ${Akonadi_SOURCE_DIR}/src/interfaces/org.freedesktop.Akonadi.Agent.Search.xml ${Akonadi_SOURCE_DIR}/src/interfaces/org.freedesktop.Akonadi.AgentServer.xml ${Akonadi_SOURCE_DIR}/src/interfaces/org.freedesktop.Akonadi.Resource.xml ${Akonadi_SOURCE_DIR}/src/interfaces/org.freedesktop.Akonadi.Preprocessor.xml ${Akonadi_SOURCE_DIR}/src/interfaces/org.freedesktop.Akonadi.Server.xml ) qt5_add_dbus_interface(control_SRCS ${Akonadi_SOURCE_DIR}/src/interfaces/org.freedesktop.Akonadi.ResourceManager.xml resource_manager) qt5_add_dbus_interface(control_SRCS ${Akonadi_SOURCE_DIR}/src/interfaces/org.freedesktop.Akonadi.PreprocessorManager.xml preprocessor_manager) add_executable(akonadi_control ${control_SRCS}) +set_target_properties(akonadi_control PROPERTIES MACOSX_BUNDLE FALSE) set_target_properties(akonadi_control PROPERTIES OUTPUT_NAME akonadi_control) if (WIN32) set_target_properties(akonadi_control PROPERTIES WIN32_EXECUTABLE TRUE) target_link_libraries(akonadi_control ${QT_QTMAIN_LIBRARY}) endif() target_link_libraries(akonadi_control akonadi_shared KF5AkonadiPrivate KF5::CoreAddons KF5::ConfigCore Qt5::Core Qt5::DBus Qt5::Gui ) install(TARGETS akonadi_control ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) configure_file(org.freedesktop.Akonadi.Control.service.cmake ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Akonadi.Control.service) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Akonadi.Control.service DESTINATION ${KDE_INSTALL_DBUSSERVICEDIR}) diff --git a/src/akonadictl/CMakeLists.txt b/src/akonadictl/CMakeLists.txt index 3d8c519d2..75352a6e1 100644 --- a/src/akonadictl/CMakeLists.txt +++ b/src/akonadictl/CMakeLists.txt @@ -1,30 +1,31 @@ include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) ########### next target ############### set(akonadictl_SRCS akonadistarter.cpp main.cpp ) ecm_qt_declare_logging_category(akonadictl_SRCS HEADER akonadictl_debug.h IDENTIFIER AKONADICTL_LOG CATEGORY_NAME org.kde.pim.akonadictl) qt5_add_dbus_interfaces(akonadictl_SRCS ${Akonadi_SOURCE_DIR}/src/interfaces/org.freedesktop.Akonadi.ControlManager.xml ${Akonadi_SOURCE_DIR}/src/interfaces/org.freedesktop.Akonadi.Janitor.xml ) add_executable(akonadictl ${akonadictl_SRCS}) +set_target_properties(akonadictl PROPERTIES MACOSX_BUNDLE FALSE) set_target_properties(akonadictl PROPERTIES OUTPUT_NAME akonadictl) ecm_mark_nongui_executable(akonadictl) target_link_libraries(akonadictl akonadi_shared KF5AkonadiPrivate KF5::CoreAddons Qt5::Core Qt5::DBus ) install(TARGETS akonadictl ${KF5_INSTALL_TARGETS_DEFAULT_ARGS} ) diff --git a/src/asapcat/CMakeLists.txt b/src/asapcat/CMakeLists.txt index 5fbd00bfd..ac2006f8d 100644 --- a/src/asapcat/CMakeLists.txt +++ b/src/asapcat/CMakeLists.txt @@ -1,17 +1,18 @@ set(asapcat_srcs main.cpp session.cpp ) add_executable(asapcat ${asapcat_srcs}) +set_target_properties(asapcat PROPERTIES MACOSX_BUNDLE FALSE) target_link_libraries(asapcat akonadi_shared KF5AkonadiPrivate Qt5::Core Qt5::Network ) install(TARGETS asapcat ${KF5_INSTALL_TARGETS_DEFAULT_ARGS} ) diff --git a/src/private/protocolgen/CMakeLists.txt b/src/private/protocolgen/CMakeLists.txt index 5c894d6cb..587263df5 100644 --- a/src/private/protocolgen/CMakeLists.txt +++ b/src/private/protocolgen/CMakeLists.txt @@ -1,15 +1,16 @@ project(protocolgen) set(protocolgen_SRCS main.cpp cppgenerator.cpp cpphelper.cpp nodetree.cpp typehelper.cpp xmlparser.cpp ) add_executable(protocolgen ${protocolgen_SRCS}) +set_target_properties(protocolgen PROPERTIES MACOSX_BUNDLE FALSE) target_link_libraries(protocolgen Qt5::Core ) diff --git a/src/rds/CMakeLists.txt b/src/rds/CMakeLists.txt index 6fc1bdd24..916f28c43 100644 --- a/src/rds/CMakeLists.txt +++ b/src/rds/CMakeLists.txt @@ -1,21 +1,22 @@ ########### next target ############### set(akonadi_rds_srcs bridgeserver.cpp bridgeconnection.cpp main.cpp ) add_executable(akonadi_rds ${akonadi_rds_srcs}) +set_target_properties(akonadi_rds PROPERTIES MACOSX_BUNDLE FALSE) target_link_libraries(akonadi_rds akonadi_shared KF5AkonadiPrivate Qt5::Core Qt5::Network ) install(TARGETS akonadi_rds ${KF5_INSTALL_TARGETS_DEFAULT_ARGS} ) diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt index 3221252f4..774177625 100644 --- a/src/server/CMakeLists.txt +++ b/src/server/CMakeLists.txt @@ -1,197 +1,198 @@ include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}) if(MYSQLD_EXECUTABLE) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMYSQLD_EXECUTABLE=\"\\\"${MYSQLD_EXECUTABLE}\\\"\"") endif() if(POSTGRES_PATH) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DPOSTGRES_PATH=\"\\\"${POSTGRES_PATH}\\\"\"") endif() ########### next target ############### set(AKONADI_DB_SCHEMA "${CMAKE_CURRENT_SOURCE_DIR}/storage/akonadidb.xml") akonadi_run_xsltproc( XSL ${CMAKE_CURRENT_SOURCE_DIR}/storage/entities.xsl XML ${AKONADI_DB_SCHEMA} BASENAME entities DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/storage/entities-source.xsl ${CMAKE_CURRENT_SOURCE_DIR}/storage/entities-header.xsl ) akonadi_run_xsltproc( XSL ${Akonadi_SOURCE_DIR}/src/server/storage/schema.xsl XML ${AKONADI_DB_SCHEMA} CLASSNAME AkonadiSchema BASENAME akonadischema DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/storage/schema-source.xsl ${CMAKE_CURRENT_SOURCE_DIR}/storage/schema-header.xsl ) akonadi_add_xmllint_test( akonadidb-xmllint XSD ${CMAKE_CURRENT_SOURCE_DIR}/storage/akonadidb.xsd XML ${AKONADI_DB_SCHEMA} ) akonadi_add_xmllint_test( akonadidbupdate-xmllint XSD ${CMAKE_CURRENT_SOURCE_DIR}/storage/akonadidb.xsd XML ${AKONADI_DB_SCHEMA} ) set(libakonadiserver_SRCS akonadi.cpp aggregatedfetchscope.cpp aklocalserver.cpp akthread.cpp commandcontext.cpp connection.cpp collectionscheduler.cpp dbusconnectionpool.cpp handler.cpp handlerhelper.cpp intervalcheck.cpp handler/collectioncopyhandler.cpp handler/collectioncreatehandler.cpp handler/collectiondeletehandler.cpp handler/collectionfetchhandler.cpp handler/collectionmodifyhandler.cpp handler/collectionmovehandler.cpp handler/collectionstatsfetchhandler.cpp handler/itemcopyhandler.cpp handler/itemcreatehandler.cpp handler/itemdeletehandler.cpp handler/itemfetchhandler.cpp handler/itemfetchhelper.cpp handler/itemlinkhandler.cpp handler/itemmodifyhandler.cpp handler/itemmovehandler.cpp handler/loginhandler.cpp handler/logouthandler.cpp handler/relationfetchhandler.cpp handler/relationmodifyhandler.cpp handler/relationremovehandler.cpp handler/resourceselecthandler.cpp handler/searchhandler.cpp handler/searchhelper.cpp handler/searchcreatehandler.cpp handler/searchresulthandler.cpp handler/tagcreatehandler.cpp handler/tagdeletehandler.cpp handler/tagfetchhandler.cpp handler/tagfetchhelper.cpp handler/tagmodifyhandler.cpp handler/transactionhandler.cpp search/agentsearchengine.cpp search/agentsearchinstance.cpp search/searchtaskmanager.cpp search/searchrequest.cpp search/searchmanager.cpp storage/collectionqueryhelper.cpp storage/collectionstatistics.cpp storage/entity.cpp ${CMAKE_CURRENT_BINARY_DIR}/entities.cpp ${CMAKE_CURRENT_BINARY_DIR}/akonadischema.cpp storage/datastore.cpp storage/dbconfig.cpp storage/dbconfigmysql.cpp storage/dbconfigpostgresql.cpp storage/dbconfigsqlite.cpp storage/dbexception.cpp storage/dbinitializer.cpp storage/dbinitializer_p.cpp storage/dbintrospector.cpp storage/dbintrospector_impl.cpp storage/dbupdater.cpp storage/dbtype.cpp storage/itemqueryhelper.cpp storage/itemretriever.cpp storage/itemretrievalmanager.cpp storage/itemretrievaljob.cpp storage/notificationcollector.cpp storage/parthelper.cpp storage/parttypehelper.cpp storage/query.cpp storage/querybuilder.cpp storage/querycache.cpp storage/queryhelper.cpp storage/schematypes.cpp storage/tagqueryhelper.cpp storage/transaction.cpp storage/parthelper.cpp storage/partstreamer.cpp storage/storagedebugger.cpp tracer.cpp utils.cpp dbustracer.cpp filetracer.cpp notificationmanager.cpp notificationsubscriber.cpp resourcemanager.cpp cachecleaner.cpp debuginterface.cpp preprocessorinstance.cpp preprocessormanager.cpp storagejanitor.cpp ) set(akonadiserver_SRCS main.cpp ) ecm_qt_declare_logging_category(akonadiserver_SRCS HEADER akonadiserver_debug.h IDENTIFIER AKONADISERVER_LOG CATEGORY_NAME org.kde.pim.akonadiserver) ecm_qt_declare_logging_category(akonadiserver_SRCS HEADER akonadiserver_search_debug.h IDENTIFIER AKONADISERVER_SEARCH_LOG CATEGORY_NAME org.kde.pim.akonadiserver.search) qt5_generate_dbus_interface(debuginterface.h org.freedesktop.Akonadi.DebugInterface.xml) qt5_add_dbus_adaptor(libakonadiserver_SRCS ${Akonadi_SOURCE_DIR}/src/interfaces/org.freedesktop.Akonadi.TracerNotification.xml dbustracer.h Akonadi::Server::DBusTracer) qt5_add_dbus_adaptor(libakonadiserver_SRCS ${Akonadi_SOURCE_DIR}/src/interfaces/org.freedesktop.Akonadi.Tracer.xml tracer.h Akonadi::Server::Tracer) qt5_add_dbus_adaptor(libakonadiserver_SRCS ${Akonadi_SOURCE_DIR}/src/interfaces/org.freedesktop.Akonadi.Server.xml akonadi.h Akonadi::Server::AkonadiServer) qt5_add_dbus_adaptor(libakonadiserver_SRCS ${Akonadi_SOURCE_DIR}/src/interfaces/org.freedesktop.Akonadi.StorageDebugger.xml storage/storagedebugger.h Akonadi::Server::StorageDebugger) qt5_add_dbus_adaptor(libakonadiserver_SRCS ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Akonadi.DebugInterface.xml debuginterface.h Akonadi::Server::DebugInterface) qt5_add_dbus_adaptor(libakonadiserver_SRCS ${Akonadi_SOURCE_DIR}/src/interfaces/org.freedesktop.Akonadi.ResourceManager.xml resourcemanager.h Akonadi::Server::ResourceManager) qt5_add_dbus_adaptor(libakonadiserver_SRCS ${Akonadi_SOURCE_DIR}/src/interfaces/org.freedesktop.Akonadi.PreprocessorManager.xml preprocessormanager.h Akonadi::Server::PreprocessorManager) qt5_add_dbus_interface(libakonadiserver_SRCS ${Akonadi_SOURCE_DIR}/src/interfaces/org.freedesktop.Akonadi.AgentManager.xml agentmanagerinterface) qt5_add_dbus_interface(libakonadiserver_SRCS ${Akonadi_SOURCE_DIR}/src/interfaces/org.freedesktop.Akonadi.Resource.xml resourceinterface) qt5_add_dbus_interface(libakonadiserver_SRCS ${Akonadi_SOURCE_DIR}/src/interfaces/org.freedesktop.Akonadi.Preprocessor.xml preprocessorinterface) qt5_add_dbus_interface(libakonadiserver_SRCS ${Akonadi_SOURCE_DIR}/src/interfaces/org.freedesktop.Akonadi.Agent.Control.xml agentcontrolinterface) qt5_add_dbus_interface(libakonadiserver_SRCS ${Akonadi_SOURCE_DIR}/src/interfaces/org.freedesktop.Akonadi.Agent.Search.xml agentsearchinterface) qt5_add_resources(libakonadiserver_SRCS storage/akonadidb.qrc) add_library(libakonadiserver STATIC ${libakonadiserver_SRCS}) set_target_properties(libakonadiserver PROPERTIES OUTPUT_NAME akonadiserver) target_link_libraries(libakonadiserver akonadi_shared KF5AkonadiPrivate Qt5::Core Qt5::Network Qt5::Sql Qt5::DBus Qt5::Xml ) add_executable(akonadiserver ${akonadiserver_SRCS}) +set_target_properties(akonadiserver PROPERTIES MACOSX_BUNDLE FALSE) set_target_properties(akonadiserver PROPERTIES OUTPUT_NAME akonadiserver) target_link_libraries(akonadiserver libakonadiserver KF5::CoreAddons ) install(TARGETS akonadiserver ${KF5_INSTALL_TARGETS_DEFAULT_ARGS} ) install(FILES storage/mysql-global.conf storage/mysql-global-mobile.conf DESTINATION ${CONFIG_INSTALL_DIR}/akonadi ) install(FILES search/abstractsearchplugin.h DESTINATION ${KF5_INCLUDE_INSTALL_DIR}/akonadi ) ## DBus XML files install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Akonadi.DebugInterface.xml DESTINATION ${AKONADI_DBUS_INTERFACES_INSTALL_DIR} ) diff --git a/src/xml/CMakeLists.txt b/src/xml/CMakeLists.txt index 71e6ef49c..b722a5312 100644 --- a/src/xml/CMakeLists.txt +++ b/src/xml/CMakeLists.txt @@ -1,94 +1,95 @@ find_package(LibXml2) set_package_properties(LibXml2 PROPERTIES DESCRIPTION "Required for XML schema validation in akonadixml" URL "http://xmlsoft.org" TYPE OPTIONAL ) # Turn exceptions on if (LIBXML2_FOUND) add_definitions(-DHAVE_LIBXML2) include_directories(${LIBXML2_INCLUDE_DIR}) endif () if (BUILD_TESTING) add_subdirectory(autotests) endif() set(akonadixml_SRCS xmldocument.cpp xmlreader.cpp xmlwritejob.cpp xmlwriter.cpp ) ecm_generate_headers(AkonadiXml_HEADERS HEADER_NAMES XmlDocument XmlReader XmlWriteJob XmlWriter REQUIRED_HEADERS AkonadiXml_HEADERS ) add_executable(akonadi2xml akonadi2xml.cpp) +set_target_properties(akonadi2xml PROPERTIES MACOSX_BUNDLE FALSE) target_link_libraries(akonadi2xml KF5::AkonadiXml KF5::I18n Qt5::Widgets # for QApplication ) add_library(KF5AkonadiXml ${akonadixml_SRCS}) generate_export_header(KF5AkonadiXml BASE_NAME akonadi-xml) add_library(KF5::AkonadiXml ALIAS KF5AkonadiXml) target_include_directories(KF5AkonadiXml INTERFACE "$") target_include_directories(KF5AkonadiXml PUBLIC "$") target_link_libraries(KF5AkonadiXml PUBLIC KF5::AkonadiCore Qt5::Xml PRIVATE KF5::I18n ${LIBXML2_LIBRARIES} ) set_target_properties(KF5AkonadiXml PROPERTIES VERSION ${AKONADI_VERSION_STRING} SOVERSION ${AKONADI_SOVERSION} EXPORT_NAME AkonadiXml ) ecm_generate_pri_file(BASE_NAME AkonadiXml LIB_NAME KF5AkonadiXml DEPS "AkonadiCore QtXml" FILENAME_VAR PRI_FILENAME ) install(TARGETS KF5AkonadiXml EXPORT KF5AkonadiTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS} ) install(TARGETS akonadi2xml ${KF5_INSTALL_TARGETS_DEFAULT_ARGS} ) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/akonadi-xml_export.h ${AkonadiXml_HEADERS} DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/AkonadiXml COMPONENT Devel ) install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR} ) install(FILES akonadi-xml.xsd DESTINATION ${KDE_INSTALL_DATADIR_KF5}/akonadi/ ) diff --git a/templates/akonadiresource/src/CMakeLists.txt b/templates/akonadiresource/src/CMakeLists.txt index 4e582b287..71b3c4223 100644 --- a/templates/akonadiresource/src/CMakeLists.txt +++ b/templates/akonadiresource/src/CMakeLists.txt @@ -1,38 +1,39 @@ set(%{APPNAMELC}resource_SRCS %{APPNAMELC}resource.cpp ) ecm_qt_declare_logging_category(%{APPNAMELC}resource_SRCS HEADER debug.h IDENTIFIER log_%{APPNAMELC}resource CATEGORY_NAME log_%{APPNAMELC}resource ) kconfig_add_kcfg_files(%{APPNAMELC}resource_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/settings.kcfgc ) kcfg_generate_dbus_interface( ${CMAKE_CURRENT_SOURCE_DIR}/settings.kcfg org.kde.Akonadi.%{APPNAME}.Settings ) qt5_add_dbus_adaptor(%{APPNAMELC}resource_SRCS ${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.%{APPNAME}.Settings.xml ${CMAKE_CURRENT_BINARY_DIR}/settings.h Settings ) add_executable(akonadi_%{APPNAMELC}_resource ${%{APPNAMELC}resource_SRCS}) +set_target_properties(akonadi_%{APPNAMELC}_resource PROPERTIES MACOSX_BUNDLE FALSE) target_link_libraries(akonadi_%{APPNAMELC}_resource Qt5::DBus KF5::AkonadiAgentBase KF5::ConfigCore ) install(TARGETS akonadi_%{APPNAMELC}_resource ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) install(FILES %{APPNAMELC}resource.desktop DESTINATION ${KDE_INSTALL_DATAROOTDIR}/akonadi/agents )