Commit 9673001a authored by Ahmad Samir's avatar Ahmad Samir
Browse files

Fix build with recent KCoreAddons

In KCoreAddons the kcoreaddons_add_plugin macro doesn't add a plugins/
suffix if the required KF version >= 90 (really 38) see [1] for details.

This broke the build here since the min. required KF version was bumped but
the CMake code wasn't changed (plugins were put into builddir/kget/ and the
build system couldn't write the binary 'kget' in the builddir because a dir
with the same name already existed).

[1] frameworks/kcoreaddons@375e19cf
parent 11a8c94e
Pipeline #164957 passed with stage
in 2 minutes and 13 seconds
......@@ -48,7 +48,7 @@ target_link_libraries(kget_bittorrent KF5::KIOCore KF5::Torrent kgetcore)
install(TARGETS kget_bittorrent DESTINATION ${KGET_PLUGIN_INSTALL_DIR})
###Build KCM-Module
kcoreaddons_add_plugin(kcm_kget_bittorrentfactory INSTALL_NAMESPACE "kget/kcms")
kcoreaddons_add_plugin(kcm_kget_bittorrentfactory INSTALL_NAMESPACE "kget_kcms")
target_sources(kcm_kget_bittorrentfactory PRIVATE
btsettingswidget.cpp
......
......@@ -121,7 +121,7 @@ X-KDE-Library=kget_bittorrentfactory
X-KDE-KGet-plugintype=TransferFactory
X-KDE-KGet-rank=200
X-KDE-KGet-framework-version=2
X-KDE-ConfigModule=kget/kcms/kcm_kget_bittorrentfactory
X-KDE-ConfigModule=kget_kcms/kcm_kget_bittorrentfactory
X-KDE-PluginInfo-Author=Lukas Appelhans
X-KDE-PluginInfo-Email=l.appelhans@gmx.de
......
......@@ -15,7 +15,7 @@ install(TARGETS kget_checksumsearchfactory DESTINATION ${KGET_PLUGIN_INSTALL_DI
install(FILES kget_checksumsearchfactory.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR})
###Build KCM-Module
kcoreaddons_add_plugin(kcm_kget_checksumsearchfactory INSTALL_NAMESPACE "kget/kcms")
kcoreaddons_add_plugin(kcm_kget_checksumsearchfactory INSTALL_NAMESPACE "kget_kcms")
target_sources(kcm_kget_checksumsearchfactory PRIVATE
../../kget_debug.cpp
......
......@@ -117,7 +117,7 @@ X-KDE-Library=kget_checksumsearchfactory
X-KDE-KGet-plugintype=TransferFactory
X-KDE-KGet-rank=30
X-KDE-KGet-framework-version=2
X-KDE-ConfigModule=kget/kcms/kcm_kget_checksumsearchfactory
X-KDE-ConfigModule=kget_kcms/kcm_kget_checksumsearchfactory
X-KDE-PluginInfo-Author=Matthias Fuchs
X-KDE-PluginInfo-Email=mat69@gmx.net
......
......@@ -18,7 +18,7 @@ install(TARGETS kget_contentfetchfactory DESTINATION ${KGET_PLUGIN_INSTALL_DIR})
install(FILES kget_contentfetchfactory.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR})
###Build KCM-Module
kcoreaddons_add_plugin(kcm_kget_contentfetchfactory INSTALL_NAMESPACE "kget/kcms")
kcoreaddons_add_plugin(kcm_kget_contentfetchfactory INSTALL_NAMESPACE "kget_kcms")
target_sources(kcm_kget_contentfetchfactory PRIVATE
dlgcontentfetchsettingwidget.cpp
......
......@@ -25,7 +25,7 @@ install(TARGETS kget_metalinkfactory DESTINATION ${KGET_PLUGIN_INSTALL_DIR})
###Build KCM-Module
kcoreaddons_add_plugin(kcm_kget_metalinkfactory INSTALL_NAMESPACE "kget/kcms")
kcoreaddons_add_plugin(kcm_kget_metalinkfactory INSTALL_NAMESPACE "kget_kcms")
target_sources(kcm_kget_metalinkfactory PRIVATE
dlgmetalink.cpp
......
......@@ -120,7 +120,7 @@ X-KDE-Library=kget_metalinkfactory
X-KDE-KGet-plugintype=TransferFactory
X-KDE-KGet-rank=110
X-KDE-KGet-framework-version=2
X-KDE-ConfigModule=kget/kcms/kcm_kget_metalinkfactory
X-KDE-ConfigModule=kget_kcms/kcm_kget_metalinkfactory
X-KDE-PluginInfo-Author=Manolo Valdes
X-KDE-PluginInfo-Email=nolis71cu@gmail.com
......
......@@ -16,7 +16,7 @@ install(TARGETS kget_mirrorsearchfactory DESTINATION ${KGET_PLUGIN_INSTALL_DIR}
install(FILES kget_mirrorsearchfactory.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR})
###Build KCM-Module
kcoreaddons_add_plugin(kcm_kget_mirrorsearchfactory INSTALL_NAMESPACE "kget/kcms")
kcoreaddons_add_plugin(kcm_kget_mirrorsearchfactory INSTALL_NAMESPACE "kget_kcms")
target_sources(kcm_kget_mirrorsearchfactory PRIVATE
dlgmirrorsearch.cpp
......
......@@ -120,7 +120,7 @@ X-KDE-Library=kget_mirrorsearchfactory
X-KDE-KGet-plugintype=TransferFactory
X-KDE-KGet-rank=40
X-KDE-KGet-framework-version=2
X-KDE-ConfigModule=kget/kcms/kcm_kget_mirrorsearchfactory
X-KDE-ConfigModule=kget_kcms/kcm_kget_mirrorsearchfactory
X-KDE-PluginInfo-Author=Manolo Valdes
X-KDE-PluginInfo-Email=nolis71cu@gmail.com
......
......@@ -20,7 +20,7 @@ install(TARGETS kget_mmsfactory DESTINATION ${KGET_PLUGIN_INSTALL_DIR})
install(FILES kget_mmsfactory.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR})
###Build KCM-Module
kcoreaddons_add_plugin(kcm_kget_mmsfactory INSTALL_NAMESPACE "kget/kcms")
kcoreaddons_add_plugin(kcm_kget_mmsfactory INSTALL_NAMESPACE "kget_kcms")
target_sources(kcm_kget_mmsfactory PRIVATE
dlgmms.cpp
......
......@@ -126,7 +126,7 @@ X-KDE-Library=kget_mmsfactory
X-KDE-KGet-plugintype=TransferFactory
X-KDE-KGet-rank=80
X-KDE-KGet-framework-version=2
X-KDE-ConfigModule=kget/kcms/kcm_kget_mmsfactory
X-KDE-ConfigModule=kget_kcms/kcm_kget_mmsfactory
X-KDE-PluginInfo-Author=Ernesto Rodriguez Ortiz
X-KDE-PluginInfo-Email=eortiz@uci.cu
......
......@@ -17,7 +17,7 @@ install(TARGETS kget_multisegkiofactory DESTINATION ${KGET_PLUGIN_INSTALL_DIR})
install(FILES kget_multisegkiofactory.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR})
###Build KCM-Module
kcoreaddons_add_plugin(kcm_kget_multisegkiofactory INSTALL_NAMESPACE "kget/kcms")
kcoreaddons_add_plugin(kcm_kget_multisegkiofactory INSTALL_NAMESPACE "kget_kcms")
target_sources(kcm_kget_multisegkiofactory PRIVATE
dlgmultisegkio.cpp
......
......@@ -129,4 +129,4 @@ X-KDE-PluginInfo-Category=Service
X-KDE-PluginInfo-License=GPL
X-KDE-PluginInfo-EnabledByDefault=true
X-KDE-PluginInfo-Name=kget_multisegkio_plugin
X-KDE-ConfigModule=kget/kcms/kcm_kget_multisegkiofactory
X-KDE-ConfigModule=kget_kcms/kcm_kget_multisegkiofactory
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