Commit 82b5e118 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Install plugin in pim<version>

parent 25fab3d7
Pipeline #186785 passed with stage
in 5 minutes and 28 seconds
......@@ -19,7 +19,7 @@ target_link_libraries(akregator_config_general
KF5::I18n
)
install(TARGETS akregator_config_general DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim/kcms/akregator)
install(TARGETS akregator_config_general DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim${QT_MAJOR_VERSION}/kcms/akregator)
########### next target ###############
......@@ -35,7 +35,7 @@ target_link_libraries(akregator_config_appearance
KF5::I18n
)
install(TARGETS akregator_config_appearance DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim/kcms/akregator)
install(TARGETS akregator_config_appearance DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim${QT_MAJOR_VERSION}/kcms/akregator)
########### next target ###############
......@@ -50,7 +50,7 @@ target_link_libraries(akregator_config_archive
KF5::TextWidgets
KF5::I18n
)
install(TARGETS akregator_config_archive DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim/kcms/akregator)
install(TARGETS akregator_config_archive DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim${QT_MAJOR_VERSION}/kcms/akregator)
########### next target ###############
......@@ -66,7 +66,7 @@ target_link_libraries(akregator_config_browser
)
install(TARGETS akregator_config_browser DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim/kcms/akregator)
install(TARGETS akregator_config_browser DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim${QT_MAJOR_VERSION}/kcms/akregator)
########### next target ###############
......@@ -89,7 +89,7 @@ target_link_libraries(akregator_config_advanced
if (COMPILE_WITH_UNITY_CMAKE_SUPPORT)
set_target_properties(akregator_config_advanced PROPERTIES UNITY_BUILD ON)
endif()
install(TARGETS akregator_config_advanced DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim/kcms/akregator)
install(TARGETS akregator_config_advanced DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim${QT_MAJOR_VERSION}/kcms/akregator)
########### next target ###############
......@@ -119,7 +119,7 @@ if (COMPILE_WITH_UNITY_CMAKE_SUPPORT)
set_target_properties(akregator_config_plugins PROPERTIES UNITY_BUILD ON)
endif()
install(TARGETS akregator_config_plugins DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim/kcms/akregator)
install(TARGETS akregator_config_plugins DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim${QT_MAJOR_VERSION}/kcms/akregator)
########### next target ###############
......@@ -136,7 +136,7 @@ if (TARGET KUserFeedbackWidgets)
KUserFeedbackWidgets
)
install(TARGETS akregator_config_userfeedback DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim/kcms/akregator)
install(TARGETS akregator_config_userfeedback DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim${QT_MAJOR_VERSION}/kcms/akregator)
endif()
......@@ -159,4 +159,4 @@ if (COMPILE_WITH_UNITY_CMAKE_SUPPORT)
set_target_properties(akregator_config_security PROPERTIES UNITY_BUILD ON)
endif()
install(TARGETS akregator_config_security DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim/kcms/akregator)
install(TARGETS akregator_config_security DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim${QT_MAJOR_VERSION}/kcms/akregator)
......@@ -7,6 +7,8 @@ include_directories(
########### next target ###############
add_library(kontact_akregatorplugin MODULE)
configure_file(akregatorplugin.json.cmake ${CMAKE_CURRENT_BINARY_DIR}/akregatorplugin.json )
qt_add_dbus_interfaces(kontact_akregator_PART_SRCS ${akregator_SOURCE_DIR}/src/org.kde.akregator.part.xml)
target_sources(kontact_akregatorplugin PRIVATE akregator_plugin.cpp akregator_plugin.h ${kontact_akregator_PART_SRCS})
......
......@@ -105,7 +105,7 @@
],
"Version": "1.0b2"
},
"X-KDE-ConfigModuleNamespace": "pim/kcms/akregator/",
"X-KDE-ConfigModuleNamespace": "pim@QT_MAJOR_VERSION@/kcms/akregator/",
"X-KDE-KontactPartExecutableName": "akregator",
"X-KDE-KontactPartLibraryName": "akregatorpart",
"X-KDE-KontactPartLoadOnStart": false,
......
......@@ -567,7 +567,8 @@ void Part::showOptions()
if (TrayIcon::getInstance()) {
connect(m_dialog, qOverload<>(&KCMultiDialog::configCommitted), TrayIcon::getInstance(), &TrayIcon::settingsChanged);
}
const QVector<KPluginMetaData> availablePlugins = KPluginMetaData::findPlugins(QStringLiteral("pim/kcms/akregator"));
const QVector<KPluginMetaData> availablePlugins =
KPluginMetaData::findPlugins(QStringLiteral("pim" QT_STRINGIFY(QT_VERSION_MAJOR)) + QStringLiteral("/kcms/akregator"));
for (const KPluginMetaData &metaData : availablePlugins) {
m_dialog->addModule(metaData);
}
......
Supports Markdown
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