Commit 6b1b4d4b authored by Ahmad Samir's avatar Ahmad Samir
Browse files

Change where plugins are created in the builddir

KCoreAddons >= 5.90 changed the behaviour of where kcoreaddons_add_plugin()
puts the plugins .so files in the builddir, i.e. it doesn't use a plugins/
subdir any more. For details see [1].

Use <builddir>/bin/k3b_plugins instead, as builddir/bin/k3b is going to be
used for the app executable.

[1] frameworks/kcoreaddons@375e19cf
parent f5a890d9
......@@ -17,7 +17,7 @@ configure_file(config-flac.h.cmake config-flac.h )
kcoreaddons_add_plugin(k3bflacdecoder
SOURCES k3bflacdecoder.cpp
INSTALL_NAMESPACE "k3b")
INSTALL_NAMESPACE "k3b_plugins")
target_include_directories(k3bflacdecoder PRIVATE ${FLAC++_INCLUDE_DIR} ${FLAC_INCLUDE_DIR})
......
kcoreaddons_add_plugin(k3blibsndfiledecoder
SOURCES k3blibsndfiledecoder.cpp
INSTALL_NAMESPACE "k3b")
INSTALL_NAMESPACE "k3b_plugins")
target_include_directories(k3blibsndfiledecoder PRIVATE ${SNDFILE_INCLUDE_DIR})
......
kcoreaddons_add_plugin(k3bmaddecoder
SOURCES k3bmad.cpp k3bmaddecoder.cpp
INSTALL_NAMESPACE "k3b")
INSTALL_NAMESPACE "k3b_plugins")
target_include_directories(k3bmaddecoder PRIVATE ${MAD_INCLUDE_DIR})
......
......@@ -3,7 +3,7 @@ configure_file(k3bmpc_config.h.cmake k3bmpc_config.h)
kcoreaddons_add_plugin(k3bmpcdecoder
SOURCES k3bmpcdecoder.cpp k3bmpcwrapper.cpp
INSTALL_NAMESPACE "k3b")
INSTALL_NAMESPACE "k3b_plugins")
target_include_directories(k3bmpcdecoder PRIVATE ${MUSE_INCLUDE_DIR})
......
kcoreaddons_add_plugin(k3boggvorbisdecoder
SOURCES k3boggvorbisdecoder.cpp
INSTALL_NAMESPACE "k3b")
INSTALL_NAMESPACE "k3b_plugins")
target_link_libraries(k3boggvorbisdecoder k3bdevice k3blib KF5::I18n ${OGGVORBIS_LIBRARIES})
kcoreaddons_add_plugin(k3bwavedecoder
SOURCES k3bwavedecoder.cpp
INSTALL_NAMESPACE "k3b")
INSTALL_NAMESPACE "k3b_plugins")
target_link_libraries(k3bwavedecoder k3bdevice k3blib KF5::I18n)
kcoreaddons_add_plugin(k3bexternalencoder
SOURCES k3bexternalencoder.cpp k3bexternalencodercommand.cpp
INSTALL_NAMESPACE "k3b")
INSTALL_NAMESPACE "k3b_plugins")
target_link_libraries(k3bexternalencoder
k3bdevice
......@@ -13,7 +13,7 @@ ki18n_wrap_ui(ui_sources
base_k3bexternalencodereditdialog.ui
)
kcoreaddons_add_plugin(kcm_k3bexternalencoder INSTALL_NAMESPACE "k3b/kcms")
kcoreaddons_add_plugin(kcm_k3bexternalencoder INSTALL_NAMESPACE "k3b_plugins/kcms")
target_sources(kcm_k3bexternalencoder PRIVATE
k3bexternalencoderconfigwidget.cpp
k3bexternalencodercommand.cpp
......
......@@ -149,5 +149,5 @@
"Name[zh_TW]": "K3b 外部音效編碼器",
"Version": "5.0"
},
"X-KDE-ConfigModule": "k3b/kcms/kcm_k3bexternalencoder"
"X-KDE-ConfigModule": "k3b_plugins/kcms/kcm_k3bexternalencoder"
}
kcoreaddons_add_plugin(k3blameencoder
SOURCES k3blameencoder.cpp
INSTALL_NAMESPACE "k3b")
INSTALL_NAMESPACE "k3b_plugins")
target_link_libraries(k3blameencoder
k3bdevice
......@@ -14,7 +14,7 @@ ki18n_wrap_ui(ui_sources
base_k3bmanualbitratesettingsdialog.ui
)
kcoreaddons_add_plugin(kcm_k3blameencoder INSTALL_NAMESPACE "k3b/kcms")
kcoreaddons_add_plugin(kcm_k3blameencoder INSTALL_NAMESPACE "k3b_plugins/kcms/")
target_sources(kcm_k3blameencoder PRIVATE
k3blameencoderconfigwidget.cpp
k3blamemanualsettingsdialog.cpp
......
......@@ -116,5 +116,5 @@
"Name[zh_TW]": "K3b Lame MP3 編碼器",
"Version": "5.0"
},
"X-KDE-ConfigModule": "k3b/kcms/kcm_k3blameencoder"
"X-KDE-ConfigModule": "k3b_plugins/kcms/kcm_k3blameencoder"
}
kcoreaddons_add_plugin(k3boggvorbisencoder
SOURCES k3boggvorbisencoder.cpp
INSTALL_NAMESPACE "k3b")
INSTALL_NAMESPACE "k3b_plugins")
target_link_libraries(k3boggvorbisencoder
k3bdevice
......@@ -11,7 +11,7 @@ target_link_libraries(k3boggvorbisencoder
ki18n_wrap_ui(ui_sources base_k3boggvorbisencodersettingswidget.ui)
kcoreaddons_add_plugin(kcm_k3boggvorbisencoder INSTALL_NAMESPACE "k3b/kcms")
kcoreaddons_add_plugin(kcm_k3boggvorbisencoder INSTALL_NAMESPACE "k3b_plugins/kcms")
target_sources(kcm_k3boggvorbisencoder PRIVATE k3boggvorbisencoderconfigwidget.cpp ${ui_sources})
target_link_libraries(kcm_k3boggvorbisencoder
......
......@@ -150,5 +150,5 @@
"Name[zh_TW]": "K3b Ogg Vorbis 編碼器",
"Version": "3.0"
},
"X-KDE-ConfigModule": "k3b/kcms/kcm_k3boggvorbisencoder"
"X-KDE-ConfigModule": "k3b_plugins/kcms/kcm_k3boggvorbisencoder"
}
kcoreaddons_add_plugin(k3bsoxencoder
SOURCES k3bsoxencoder.cpp
INSTALL_NAMESPACE "k3b")
INSTALL_NAMESPACE "k3b_plugins")
target_link_libraries(k3bsoxencoder
k3bdevice
......@@ -10,7 +10,7 @@ target_link_libraries(k3bsoxencoder
ki18n_wrap_ui(ui_sources base_k3bsoxencoderconfigwidget.ui)
kcoreaddons_add_plugin(kcm_k3bsoxencoder INSTALL_NAMESPACE "k3b/kcms")
kcoreaddons_add_plugin(kcm_k3bsoxencoder INSTALL_NAMESPACE "k3b_plugins/kcms")
target_sources(kcm_k3bsoxencoder PRIVATE k3bsoxencoderconfigwidget.cpp ${ui_sources})
target_link_libraries(kcm_k3bsoxencoder
......
......@@ -149,5 +149,5 @@
"Name[zh_TW]": "K3b SoX 音效編碼器",
"Version": "3.0"
},
"X-KDE-ConfigModule": "k3b/kcms/kcm_k3bsoxencoder"
"X-KDE-ConfigModule": "k3b_plugins/kcms/kcm_k3bsoxencoder"
}
kcoreaddons_add_plugin(k3baudiometainforenamerplugin
SOURCES k3baudiometainforenamerplugin.cpp
INSTALL_NAMESPACE "k3b")
INSTALL_NAMESPACE "k3b_plugins")
target_link_libraries(k3baudiometainforenamerplugin
k3bdevice
......
kcoreaddons_add_plugin(k3baudioprojectcddbplugin
SOURCES k3baudioprojectcddbplugin.cpp
INSTALL_NAMESPACE "k3b")
INSTALL_NAMESPACE "k3b_plugins")
target_link_libraries(k3baudioprojectcddbplugin
k3bdevice
......
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