diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,7 +30,7 @@ ######################### General Requirements ########################## -find_package(ECM 0.0.11 REQUIRED NO_MODULE) +find_package(ECM 5.38 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) include(KDEInstallDirs) diff --git a/kmymoney/plugins/checkprinting/CMakeLists.txt b/kmymoney/plugins/checkprinting/CMakeLists.txt --- a/kmymoney/plugins/checkprinting/CMakeLists.txt +++ b/kmymoney/plugins/checkprinting/CMakeLists.txt @@ -9,7 +9,15 @@ kconfig_add_kcfg_files(checkprinting_PART_SRCS pluginsettings.kcfgc) -add_library(checkprinting MODULE ${checkprinting_PART_SRCS}) +kcoreaddons_add_plugin(checkprinting + SOURCES ${checkprinting_PART_SRCS} + JSON "${CMAKE_CURRENT_BINARY_DIR}/checkprinting.json" + INSTALL_NAMESPACE "kmymoney") + +#kcoreaddons_add_plugin sets LIBRARY_OUTPUT_DIRECTORY to ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${INSTALL_NAMESPACE} +set_target_properties(checkprinting + PROPERTIES + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") target_link_libraries(checkprinting Qt5::PrintSupport @@ -24,9 +32,6 @@ target_link_libraries(checkprinting KF5::WebKit) endif(ENABLE_WEBENGINE) -install(TARGETS checkprinting - DESTINATION "${KDE_INSTALL_PLUGINDIR}/kmymoney/") - install(FILES checkprinting.rc DESTINATION "${KXMLGUI_INSTALL_DIR}/checkprinting") @@ -46,10 +51,18 @@ ki18n_wrap_ui(kcm_checkprinting_PART_SRCS pluginsettingsdecl.ui) -add_library(kcm_checkprinting MODULE ${kcm_checkprinting_PART_SRCS}) +kcoreaddons_add_plugin(kcm_checkprinting + SOURCES ${kcm_checkprinting_PART_SRCS} + JSON "${CMAKE_CURRENT_BINARY_DIR}/kcm_checkprinting.json" + INSTALL_NAMESPACE "kmymoney") kcoreaddons_desktop_to_json(kcm_checkprinting kcm_checkprinting.desktop) +#kcoreaddons_add_plugin sets LIBRARY_OUTPUT_DIRECTORY to ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${INSTALL_NAMESPACE} +set_target_properties(kcm_checkprinting + PROPERTIES + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") + target_link_libraries(kcm_checkprinting Qt5::PrintSupport KF5::I18n @@ -65,8 +78,5 @@ target_link_libraries(kcm_checkprinting KF5::WebKit) endif(ENABLE_WEBENGINE) -install(TARGETS kcm_checkprinting - DESTINATION "${KDE_INSTALL_PLUGINDIR}/kmymoney") - install(FILES kcm_checkprinting.desktop DESTINATION "${SERVICES_INSTALL_DIR}") diff --git a/kmymoney/plugins/csv/export/CMakeLists.txt b/kmymoney/plugins/csv/export/CMakeLists.txt --- a/kmymoney/plugins/csv/export/CMakeLists.txt +++ b/kmymoney/plugins/csv/export/CMakeLists.txt @@ -13,9 +13,15 @@ csvexportdlg.ui ) -add_library(csvexporter MODULE - ${csvexporter_PART_SRCS} -) +kcoreaddons_add_plugin(csvexporter + SOURCES ${csvexporter_PART_SRCS} + JSON "${CMAKE_CURRENT_BINARY_DIR}/csvexporter.json" + INSTALL_NAMESPACE "kmymoney") + +#kcoreaddons_add_plugin sets LIBRARY_OUTPUT_DIRECTORY to ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${INSTALL_NAMESPACE} +set_target_properties(csvexporter + PROPERTIES + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") target_link_libraries(csvexporter kmm_mymoney kmm_plugin @@ -27,9 +33,5 @@ install(FILES csvexporter.rc DESTINATION "${KXMLGUI_INSTALL_DIR}/csvexporter") -install(TARGETS csvexporter - DESTINATION "${KDE_INSTALL_PLUGINDIR}/kmymoney/") - - #INSTALL(FILES csvexporterrc # DESTINATION ${CONFIG_INSTALL_DIR}) diff --git a/kmymoney/plugins/csv/import/CMakeLists.txt b/kmymoney/plugins/csv/import/CMakeLists.txt --- a/kmymoney/plugins/csv/import/CMakeLists.txt +++ b/kmymoney/plugins/csv/import/CMakeLists.txt @@ -38,8 +38,16 @@ currenciesdlg.ui ) -# Use static library for tests and prices importer only -add_library(csvimporter MODULE ${csvimporter_PART_SRCS}) +kcoreaddons_add_plugin(csvimporter + SOURCES ${csvimporter_PART_SRCS} + JSON "${CMAKE_CURRENT_BINARY_DIR}/csvimporter.json" + INSTALL_NAMESPACE "kmymoney") + + +#kcoreaddons_add_plugin sets LIBRARY_OUTPUT_DIRECTORY to ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${INSTALL_NAMESPACE} +set_target_properties(csvimporter + PROPERTIES + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") target_link_libraries(csvimporter PUBLIC @@ -52,9 +60,6 @@ install(FILES csvimporter.rc DESTINATION "${KXMLGUI_INSTALL_DIR}/csvimporter") -install(TARGETS csvimporter - DESTINATION "${KDE_INSTALL_PLUGINDIR}/kmymoney/") - # the KCM module set(kcm_csvimporter_PART_SRCS kcm_csvimporter.cpp @@ -64,17 +69,22 @@ ki18n_wrap_ui(kcm_csvimporter_PART_SRCS pluginsettingsdecl.ui) -add_library(kcm_csvimporter MODULE ${kcm_csvimporter_PART_SRCS}) +kcoreaddons_add_plugin(kcm_csvimporter + SOURCES ${kcm_csvimporter_PART_SRCS} + JSON "${CMAKE_CURRENT_BINARY_DIR}/kcm_csvimporter.json" + INSTALL_NAMESPACE "kmymoney") kcoreaddons_desktop_to_json(kcm_csvimporter kcm_csvimporter.desktop) +#kcoreaddons_add_plugin sets LIBRARY_OUTPUT_DIRECTORY to ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${INSTALL_NAMESPACE} +set_target_properties(kcm_csvimporter + PROPERTIES + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") + target_link_libraries(kcm_csvimporter KF5::I18n KF5::ConfigWidgets ) -install(TARGETS kcm_csvimporter - DESTINATION "${KDE_INSTALL_PLUGINDIR}/kmymoney") - install(FILES kcm_csvimporter.desktop DESTINATION ${SERVICES_INSTALL_DIR}) diff --git a/kmymoney/plugins/forecast/CMakeLists.txt b/kmymoney/plugins/forecast/CMakeLists.txt --- a/kmymoney/plugins/forecast/CMakeLists.txt +++ b/kmymoney/plugins/forecast/CMakeLists.txt @@ -9,7 +9,15 @@ ki18n_wrap_ui(forecastview_SOURCES kforecastview.ui) kconfig_add_kcfg_files(forecastview_SOURCES forecastviewsettings.kcfgc) -add_library(forecastview MODULE ${forecastview_SOURCES} ) +kcoreaddons_add_plugin(forecastview + SOURCES ${forecastview_SOURCES} + JSON "${CMAKE_CURRENT_BINARY_DIR}/forecastview.json" + INSTALL_NAMESPACE "kmymoney") + +#kcoreaddons_add_plugin sets LIBRARY_OUTPUT_DIRECTORY to ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${INSTALL_NAMESPACE} +set_target_properties(forecastview + PROPERTIES + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") target_link_libraries(forecastview PUBLIC @@ -32,10 +40,18 @@ ki18n_wrap_ui(kcm_forecastview_PART_SRCS forecastviewsettings.ui) -add_library(kcm_forecastview MODULE ${kcm_forecastview_PART_SRCS}) +kcoreaddons_add_plugin(kcm_forecastview + SOURCES ${kcm_forecastview_PART_SRCS} + JSON "${CMAKE_CURRENT_BINARY_DIR}/kcm_forecastview.json" + INSTALL_NAMESPACE "kmymoney") kcoreaddons_desktop_to_json(kcm_forecastview kcm_forecastview.desktop) +#kcoreaddons_add_plugin sets LIBRARY_OUTPUT_DIRECTORY to ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${INSTALL_NAMESPACE} +set_target_properties(kcm_forecastview + PROPERTIES + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") + target_link_libraries(kcm_forecastview KF5::I18n KF5::ConfigWidgets @@ -45,8 +61,5 @@ kmm_settings ) -install(TARGETS kcm_forecastview - DESTINATION "${KDE_INSTALL_PLUGINDIR}/kmymoney") - install(FILES kcm_forecastview.desktop DESTINATION "${SERVICES_INSTALL_DIR}") diff --git a/kmymoney/plugins/gnc/import/CMakeLists.txt b/kmymoney/plugins/gnc/import/CMakeLists.txt --- a/kmymoney/plugins/gnc/import/CMakeLists.txt +++ b/kmymoney/plugins/gnc/import/CMakeLists.txt @@ -18,14 +18,17 @@ ki18n_wrap_ui(gncimporter_PART_SRCS ${gncimporter_PART_UI}) -add_library(gncimporter MODULE ${gncimporter_PART_SRCS}) +kcoreaddons_add_plugin(gncimporter + SOURCES ${gncimporter_PART_SRCS} + JSON "${CMAKE_CURRENT_BINARY_DIR}/gncimporter.json" + INSTALL_NAMESPACE "kmymoney") + +#kcoreaddons_add_plugin sets LIBRARY_OUTPUT_DIRECTORY to ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${INSTALL_NAMESPACE} +set_target_properties(gncimporter + PROPERTIES + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") target_link_libraries(gncimporter kmm_plugin Alkimia::alkimia ) - -########### install files ############### - -install(TARGETS gncimporter - DESTINATION "${KDE_INSTALL_PLUGINDIR}/kmymoney/") diff --git a/kmymoney/plugins/icalendar/export/CMakeLists.txt b/kmymoney/plugins/icalendar/export/CMakeLists.txt --- a/kmymoney/plugins/icalendar/export/CMakeLists.txt +++ b/kmymoney/plugins/icalendar/export/CMakeLists.txt @@ -10,7 +10,16 @@ ) kconfig_add_kcfg_files(icalendarexporter_PART_SRCS pluginsettings.kcfgc) -add_library(icalendarexporter MODULE ${icalendarexporter_PART_SRCS}) + +kcoreaddons_add_plugin(icalendarexporter + SOURCES ${icalendarexporter_PART_SRCS} + JSON "${CMAKE_CURRENT_BINARY_DIR}/icalendarexporter.json" + INSTALL_NAMESPACE "kmymoney") + +#kcoreaddons_add_plugin sets LIBRARY_OUTPUT_DIRECTORY to ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${INSTALL_NAMESPACE} +set_target_properties(icalendarexporter + PROPERTIES + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") target_include_directories(icalendarexporter PRIVATE ${LIBICAL_INCLUDE_DIRS}) target_link_libraries(icalendarexporter @@ -23,9 +32,6 @@ install(FILES icalendarexporter.rc DESTINATION "${KXMLGUI_INSTALL_DIR}/icalendarexporter") -install(TARGETS icalendarexporter - DESTINATION "${KDE_INSTALL_PLUGINDIR}/kmymoney/") - # the KCM module set(kcm_icalendarexporter_PART_SRCS @@ -35,9 +41,18 @@ kconfig_add_kcfg_files(kcm_icalendarexporter_PART_SRCS pluginsettings.kcfgc) ki18n_wrap_ui(kcm_icalendarexporter_PART_SRCS pluginsettingsdecl.ui) -add_library(kcm_icalendarexporter MODULE ${kcm_icalendarexporter_PART_SRCS}) +kcoreaddons_add_plugin(kcm_icalendarexporter + SOURCES ${kcm_icalendarexporter_PART_SRCS} + JSON "${CMAKE_CURRENT_BINARY_DIR}/kcm_icalendarexporter.json" + INSTALL_NAMESPACE "kmymoney") + kcoreaddons_desktop_to_json(kcm_icalendarexporter kcm_icalendarexporter.desktop) +#kcoreaddons_add_plugin sets LIBRARY_OUTPUT_DIRECTORY to ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${INSTALL_NAMESPACE} +set_target_properties(kcm_icalendarexporter + PROPERTIES + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") + target_link_libraries(kcm_icalendarexporter KF5::I18n KF5::ConfigWidgets @@ -47,8 +62,5 @@ Qt5::Gui ) -install(TARGETS kcm_icalendarexporter - DESTINATION "${KDE_INSTALL_PLUGINDIR}/kmymoney") - install(FILES kcm_icalendarexporter.desktop DESTINATION ${SERVICES_INSTALL_DIR}) diff --git a/kmymoney/plugins/kbanking/CMakeLists.txt b/kmymoney/plugins/kbanking/CMakeLists.txt --- a/kmymoney/plugins/kbanking/CMakeLists.txt +++ b/kmymoney/plugins/kbanking/CMakeLists.txt @@ -17,7 +17,15 @@ kconfig_add_kcfg_files(kbanking_PART_SRCS kbankingsettings.kcfgc) -add_library(kbanking MODULE ${kbanking_PART_SRCS}) +kcoreaddons_add_plugin(kbanking + SOURCES ${kbanking_PART_SRCS} + JSON "${CMAKE_CURRENT_BINARY_DIR}/kbanking.json" + INSTALL_NAMESPACE "kmymoney") + +#kcoreaddons_add_plugin sets LIBRARY_OUTPUT_DIRECTORY to ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${INSTALL_NAMESPACE} +set_target_properties(kbanking + PROPERTIES + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") target_link_libraries(kbanking kbanking_dialogs @@ -54,8 +62,5 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kbanking.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/kbanking) -install(TARGETS kbanking - DESTINATION "${KDE_INSTALL_PLUGINDIR}/kmymoney/") - install(FILES kbanking.kcfg DESTINATION ${KCFG_INSTALL_DIR}) diff --git a/kmymoney/plugins/ofx/import/CMakeLists.txt b/kmymoney/plugins/ofx/import/CMakeLists.txt --- a/kmymoney/plugins/ofx/import/CMakeLists.txt +++ b/kmymoney/plugins/ofx/import/CMakeLists.txt @@ -20,7 +20,15 @@ ki18n_wrap_ui(ofximporter_PART_SRCS ${ofximporter_PART_UI}) -add_library(ofximporter MODULE ${ofximporter_PART_SRCS}) +kcoreaddons_add_plugin(ofximporter + SOURCES ${ofximporter_PART_SRCS} + JSON "${CMAKE_CURRENT_BINARY_DIR}/ofximporter.json" + INSTALL_NAMESPACE "kmymoney") + +#kcoreaddons_add_plugin sets LIBRARY_OUTPUT_DIRECTORY to ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${INSTALL_NAMESPACE} +set_target_properties(ofximporter + PROPERTIES + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") target_link_libraries(ofximporter ofximporter_dialogs @@ -39,11 +47,8 @@ ${CMAKE_CURRENT_BINARY_DIR}/dialogs ${LIBOFX_INCLUDE_DIR} ) - + ########### install files ############### install(FILES ofximporter.rc DESTINATION "${KXMLGUI_INSTALL_DIR}/ofximporter") - -install(TARGETS ofximporter - DESTINATION "${KDE_INSTALL_PLUGINDIR}/kmymoney/") diff --git a/kmymoney/plugins/onlinejobpluginmockup/CMakeLists.txt b/kmymoney/plugins/onlinejobpluginmockup/CMakeLists.txt --- a/kmymoney/plugins/onlinejobpluginmockup/CMakeLists.txt +++ b/kmymoney/plugins/onlinejobpluginmockup/CMakeLists.txt @@ -6,15 +6,17 @@ onlinejobpluginmockup.cpp ) -add_library(onlinejobpluginmockup MODULE ${onlinejobpluginmockup_PART_SRCS}) +kcoreaddons_add_plugin(onlinejobpluginmockup + SOURCES ${onlinejobpluginmockup_PART_SRCS} + JSON "${CMAKE_CURRENT_BINARY_DIR}/onlinejobpluginmockup.json" + INSTALL_NAMESPACE "kmymoney") + +#kcoreaddons_add_plugin sets LIBRARY_OUTPUT_DIRECTORY to ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${INSTALL_NAMESPACE} +set_target_properties(onlinejobpluginmockup + PROPERTIES + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") target_link_libraries(onlinejobpluginmockup kmm_mymoney kmm_plugin ) - - -########### install files ############### - -install(TARGETS onlinejobpluginmockup - DESTINATION "${KDE_INSTALL_PLUGINDIR}/kmymoney/") diff --git a/kmymoney/plugins/onlinetasks/sepa/CMakeLists.txt b/kmymoney/plugins/onlinetasks/sepa/CMakeLists.txt --- a/kmymoney/plugins/onlinetasks/sepa/CMakeLists.txt +++ b/kmymoney/plugins/onlinetasks/sepa/CMakeLists.txt @@ -19,9 +19,15 @@ add_library(konlinetasks_sepa_interface INTERFACE) -add_library(konlinetasks_sepa MODULE - ${sepaOnlineTasks_SRCS} -) +kcoreaddons_add_plugin(konlinetasks_sepa + SOURCES ${sepaOnlineTasks_SRCS} + JSON "${CMAKE_CURRENT_BINARY_DIR}/konlinetasks_sepa.json" + INSTALL_NAMESPACE "kmymoney") + +#kcoreaddons_add_plugin sets LIBRARY_OUTPUT_DIRECTORY to ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${INSTALL_NAMESPACE} +set_target_properties(konlinetasks_sepa + PROPERTIES + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") # TODO some dependencies can be moved to konlinetasks_sepa target_link_libraries( konlinetasks_sepa_interface @@ -48,9 +54,6 @@ KF5::ItemModels ) -install(TARGETS konlinetasks_sepa - DESTINATION "${KDE_INSTALL_PLUGINDIR}/kmymoney/") - install(FILES ${sepaOnlineTasks_HEADER} DESTINATION "${INCLUDE_INSTALL_DIR}/kmymoney/onlinetasks/sepa/" COMPONENT Devel) diff --git a/kmymoney/plugins/qif/config/CMakeLists.txt b/kmymoney/plugins/qif/config/CMakeLists.txt --- a/kmymoney/plugins/qif/config/CMakeLists.txt +++ b/kmymoney/plugins/qif/config/CMakeLists.txt @@ -7,7 +7,10 @@ ki18n_wrap_ui(kcm_qif_PART_SRCS mymoneyqifprofileeditor.ui) -add_library(kcm_qif MODULE ${kcm_qif_PART_SRCS}) +kcoreaddons_add_plugin(kcm_qif + SOURCES ${kcm_qif_PART_SRCS} + JSON "${CMAKE_CURRENT_BINARY_DIR}/kcm_qif.json" + INSTALL_NAMESPACE "kmymoney") if(ENABLE_QIFIMPORTER) kcoreaddons_desktop_to_json(kcm_qif kcm_qifimporter.desktop) @@ -17,6 +20,10 @@ kcoreaddons_desktop_to_json(kcm_qif kcm_qifexporter.desktop) endif() +#kcoreaddons_add_plugin sets LIBRARY_OUTPUT_DIRECTORY to ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${INSTALL_NAMESPACE} +set_target_properties(kcm_qif + PROPERTIES + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") target_link_libraries(kcm_qif kmm_mymoney @@ -26,14 +33,11 @@ KF5::KIOWidgets ) -install(TARGETS kcm_qif - DESTINATION "${KDE_INSTALL_PLUGINDIR}/kmymoney") - if(ENABLE_QIFIMPORTER) install(FILES kcm_qifimporter.desktop DESTINATION ${SERVICES_INSTALL_DIR}) endif() - + if(ENABLE_QIFEXPORTER) install(FILES kcm_qifexporter.desktop DESTINATION ${SERVICES_INSTALL_DIR}) diff --git a/kmymoney/plugins/qif/export/CMakeLists.txt b/kmymoney/plugins/qif/export/CMakeLists.txt --- a/kmymoney/plugins/qif/export/CMakeLists.txt +++ b/kmymoney/plugins/qif/export/CMakeLists.txt @@ -17,17 +17,22 @@ ki18n_wrap_ui(qifexporter_PART_SRCS ${qifexporter_PART_UI}) -add_library(qifexporter MODULE ${qifexporter_PART_SRCS}) +kcoreaddons_add_plugin(qifexporter + SOURCES ${qifexporter_PART_SRCS} + JSON "${CMAKE_CURRENT_BINARY_DIR}/qifexporter.json" + INSTALL_NAMESPACE "kmymoney") + +#kcoreaddons_add_plugin sets LIBRARY_OUTPUT_DIRECTORY to ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${INSTALL_NAMESPACE} +set_target_properties(qifexporter + PROPERTIES + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") target_link_libraries(qifexporter kmm_plugin models #TODO: Get rid of this big dependency ) - + ########### install files ############### install(FILES qifexporter.rc DESTINATION "${KXMLGUI_INSTALL_DIR}/qifexporter") - -install(TARGETS qifexporter - DESTINATION "${KDE_INSTALL_PLUGINDIR}/kmymoney/") diff --git a/kmymoney/plugins/qif/import/CMakeLists.txt b/kmymoney/plugins/qif/import/CMakeLists.txt --- a/kmymoney/plugins/qif/import/CMakeLists.txt +++ b/kmymoney/plugins/qif/import/CMakeLists.txt @@ -16,18 +16,23 @@ ki18n_wrap_ui(qifimporter_PART_SRCS ${qifimporter_PART_UI}) -add_library(qifimporter MODULE ${qifimporter_PART_SRCS}) +kcoreaddons_add_plugin(qifimporter + SOURCES ${qifimporter_PART_SRCS} + JSON "${CMAKE_CURRENT_BINARY_DIR}/qifimporter.json" + INSTALL_NAMESPACE "kmymoney") + +#kcoreaddons_add_plugin sets LIBRARY_OUTPUT_DIRECTORY to ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${INSTALL_NAMESPACE} +set_target_properties(qifimporter + PROPERTIES + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") target_link_libraries(qifimporter kmm_settings kmm_plugin Alkimia::alkimia ) - + ########### install files ############### install(FILES qifimporter.rc DESTINATION "${KXMLGUI_INSTALL_DIR}/qifimporter") - -install(TARGETS qifimporter - DESTINATION "${KDE_INSTALL_PLUGINDIR}/kmymoney/") diff --git a/kmymoney/plugins/reconciliationreport/CMakeLists.txt b/kmymoney/plugins/reconciliationreport/CMakeLists.txt --- a/kmymoney/plugins/reconciliationreport/CMakeLists.txt +++ b/kmymoney/plugins/reconciliationreport/CMakeLists.txt @@ -11,7 +11,15 @@ ki18n_wrap_ui(reconciliationreport_PART_SRCS kreconciliationreportdlgdecl.ui ) -add_library(reconciliationreport MODULE ${reconciliationreport_PART_SRCS}) +kcoreaddons_add_plugin(reconciliationreport + SOURCES ${reconciliationreport_PART_SRCS} + JSON "${CMAKE_CURRENT_BINARY_DIR}/reconciliationreport.json" + INSTALL_NAMESPACE "kmymoney") + +#kcoreaddons_add_plugin sets LIBRARY_OUTPUT_DIRECTORY to ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${INSTALL_NAMESPACE} +set_target_properties(reconciliationreport + PROPERTIES + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") target_link_libraries(reconciliationreport Qt5::PrintSupport @@ -24,6 +32,3 @@ else(ENABLE_WEBENGINE) target_link_libraries(reconciliationreport KF5::WebKit) endif(ENABLE_WEBENGINE) - -install(TARGETS reconciliationreport - DESTINATION "${KDE_INSTALL_PLUGINDIR}/kmymoney/") diff --git a/kmymoney/plugins/sql/CMakeLists.txt b/kmymoney/plugins/sql/CMakeLists.txt --- a/kmymoney/plugins/sql/CMakeLists.txt +++ b/kmymoney/plugins/sql/CMakeLists.txt @@ -13,7 +13,16 @@ ki18n_wrap_ui(sqlstorage_SOURCES kselectdatabasedlg.ui kgeneratesqldlg.ui) -add_library(sqlstorage MODULE ${sqlstorage_SOURCES} ) +kcoreaddons_add_plugin(sqlstorage + SOURCES ${sqlstorage_SOURCES} + JSON "${CMAKE_CURRENT_BINARY_DIR}/sqlstorage.json" + INSTALL_NAMESPACE "kmymoney") + +#kcoreaddons_add_plugin sets LIBRARY_OUTPUT_DIRECTORY to ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${INSTALL_NAMESPACE} +set_target_properties(sqlstorage + PROPERTIES + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") + kde_target_enable_exceptions(sqlstorage PUBLIC) target_link_libraries(sqlstorage @@ -26,9 +35,6 @@ install(FILES sqlstorage.rc DESTINATION "${KXMLGUI_INSTALL_DIR}/sqlstorage") -install(TARGETS sqlstorage - DESTINATION "${KDE_INSTALL_PLUGINDIR}/kmymoney") - install(FILES kmymoney-sqlstorageplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) diff --git a/kmymoney/plugins/weboob/CMakeLists.txt b/kmymoney/plugins/weboob/CMakeLists.txt --- a/kmymoney/plugins/weboob/CMakeLists.txt +++ b/kmymoney/plugins/weboob/CMakeLists.txt @@ -13,7 +13,15 @@ weboob.cpp ) -add_library(weboob MODULE ${weboob_PART_SRCS}) +kcoreaddons_add_plugin(weboob + SOURCES ${weboob_PART_SRCS} + JSON "${CMAKE_CURRENT_BINARY_DIR}/weboob.json" + INSTALL_NAMESPACE "kmymoney") + +#kcoreaddons_add_plugin sets LIBRARY_OUTPUT_DIRECTORY to ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${INSTALL_NAMESPACE} +set_target_properties(weboob + PROPERTIES + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") target_link_libraries( weboob @@ -30,7 +38,3 @@ install(FILES weboob.rc DESTINATION "${KXMLGUI_INSTALL_DIR}/weboob") - -install(TARGETS weboob - DESTINATION "${KDE_INSTALL_PLUGINDIR}/kmymoney/") -