Pass in JSON parameter in kcoreaddons_add_plugin function call

This will make sure that the plugin gets rebuild when the JSON file
changes. The kcoreaddons_desktop_to_json method call would do the same
with the generated JSON file.

plugins/decoder/ffmpeg/CMakeLists.txt

-kcoreaddons_add_plugin(k3bffmpegdecoder SOURCES k3bffmpegdecoder.cpp k3bffmpegwrapper.cpp INSTALL_NAMESPACE "k3b")
-kcoreaddons_desktop_to_json(k3bffmpegdecoder "k3bffmpegdecoder.desktop" SERVICE_TYPES ${CMAKE_SOURCE_DIR}/libk3b/plugin/k3bplugin.desktop)
+kcoreaddons_add_plugin(k3bffmpegdecoder
+    SOURCES k3bffmpegdecoder.cpp k3bffmpegwrapper.cpp
+    INSTALL_NAMESPACE "k3b"
+    JSON "k3bffmpegdecoder.json")
 
 if(FFMPEG_INCLUDE_DIR_OLD_STYLE)
     message(STATUS "didn't find new ffmpegcodecpath")

plugins/decoder/flac/CMakeLists.txt

@@ -15,8 +15,10 @@ endif()
 
 configure_file(config-flac.h.cmake config-flac.h )
 
-kcoreaddons_add_plugin(k3bflacdecoder SOURCES k3bflacdecoder.cpp INSTALL_NAMESPACE "k3b")
-kcoreaddons_desktop_to_json(k3bflacdecoder "k3bflacdecoder.desktop" SERVICE_TYPES ${CMAKE_SOURCE_DIR}/libk3b/plugin/k3bplugin.desktop)
+kcoreaddons_add_plugin(k3bflacdecoder
+    SOURCES k3bflacdecoder.cpp
+    INSTALL_NAMESPACE "k3b"
+    JSON "k3bflacdecoder.json")
 
 target_include_directories(k3bflacdecoder PRIVATE ${FLAC++_INCLUDE_DIR} ${FLAC_INCLUDE_DIR})
 

plugins/decoder/libsndfile/CMakeLists.txt

-kcoreaddons_add_plugin(k3blibsndfiledecoder SOURCES k3blibsndfiledecoder.cpp INSTALL_NAMESPACE "k3b")
-kcoreaddons_desktop_to_json(k3blibsndfiledecoder "k3blibsndfiledecoder.desktop" SERVICE_TYPES ${CMAKE_SOURCE_DIR}/libk3b/plugin/k3bplugin.desktop)
+kcoreaddons_add_plugin(k3blibsndfiledecoder
+    SOURCES k3blibsndfiledecoder.cpp
+    INSTALL_NAMESPACE "k3b"
+    JSON "k3blibsndfiledecoder.json")
 
 target_include_directories(k3blibsndfiledecoder PRIVATE ${SNDFILE_INCLUDE_DIR})
 

plugins/decoder/mp3/CMakeLists.txt

-kcoreaddons_add_plugin(k3bmaddecoder SOURCES k3bmad.cpp k3bmaddecoder.cpp INSTALL_NAMESPACE "k3b")
-kcoreaddons_desktop_to_json(k3bmaddecoder "k3bmaddecoder.desktop" SERVICE_TYPES ${CMAKE_SOURCE_DIR}/libk3b/plugin/k3bplugin.desktop)
+kcoreaddons_add_plugin(k3bmaddecoder
+    SOURCES k3bmad.cpp k3bmaddecoder.cpp
+    INSTALL_NAMESPACE "k3b"
+    JSON "k3bmaddecoder.json")
 
 target_include_directories(k3bmaddecoder PRIVATE ${MAD_INCLUDE_DIR})
 

plugins/decoder/musepack/CMakeLists.txt

 
 configure_file(k3bmpc_config.h.cmake k3bmpc_config.h)
 
-kcoreaddons_add_plugin(k3bmpcdecoder SOURCES k3bmpcdecoder.cpp k3bmpcwrapper.cpp INSTALL_NAMESPACE "k3b")
-kcoreaddons_desktop_to_json(k3bmpcdecoder "k3bmpcdecoder.desktop" SERVICE_TYPES ${CMAKE_SOURCE_DIR}/libk3b/plugin/k3bplugin.desktop)
+kcoreaddons_add_plugin(k3bmpcdecoder
+    SOURCES k3bmpcdecoder.cpp k3bmpcwrapper.cpp
+    INSTALL_NAMESPACE "k3b"
+    JSON "k3bmpcdecoder.json")
 
 target_include_directories(k3bmpcdecoder PRIVATE ${MUSE_INCLUDE_DIR})
 

plugins/decoder/ogg/CMakeLists.txt

-kcoreaddons_add_plugin(k3boggvorbisdecoder SOURCES k3boggvorbisdecoder.cpp INSTALL_NAMESPACE "k3b")
-kcoreaddons_desktop_to_json(k3boggvorbisdecoder "k3boggvorbisdecoder.desktop" SERVICE_TYPES ${CMAKE_SOURCE_DIR}/libk3b/plugin/k3bplugin.desktop)
+kcoreaddons_add_plugin(k3boggvorbisdecoder
+    SOURCES k3boggvorbisdecoder.cpp
+    INSTALL_NAMESPACE "k3b"
+    JSON "k3boggvorbisdecoder.json")
 
 target_link_libraries(k3boggvorbisdecoder k3bdevice k3blib KF5::I18n ${OGGVORBIS_LIBRARIES})

plugins/decoder/wave/CMakeLists.txt

-kcoreaddons_add_plugin(k3bwavedecoder SOURCES k3bwavedecoder.cpp INSTALL_NAMESPACE "k3b")
-kcoreaddons_desktop_to_json(k3bwavedecoder "k3bwavedecoder.desktop" SERVICE_TYPES ${CMAKE_SOURCE_DIR}/libk3b/plugin/k3bplugin.desktop)
+kcoreaddons_add_plugin(k3bwavedecoder
+    SOURCES k3bwavedecoder.cpp
+    INSTALL_NAMESPACE "k3b"
+    JSON "k3bwavedecoder.json")
 
 target_link_libraries(k3bwavedecoder k3bdevice k3blib KF5::I18n)

plugins/encoder/external/CMakeLists.txt

-kcoreaddons_add_plugin(k3bexternalencoder SOURCES k3bexternalencoder.cpp k3bexternalencodercommand.cpp INSTALL_NAMESPACE "k3b")
-kcoreaddons_desktop_to_json(k3bexternalencoder "k3bexternalencoder.desktop" SERVICE_TYPES ${CMAKE_SOURCE_DIR}/libk3b/plugin/k3bplugin.desktop)
+kcoreaddons_add_plugin(k3bexternalencoder
+    SOURCES k3bexternalencoder.cpp k3bexternalencodercommand.cpp
+    INSTALL_NAMESPACE "k3b"
+    JSON "k3bexternalencoder.json")
 
 target_link_libraries(k3bexternalencoder
     k3bdevice

plugins/encoder/lame/CMakeLists.txt

-kcoreaddons_add_plugin(k3blameencoder SOURCES k3blameencoder.cpp INSTALL_NAMESPACE "k3b")
-kcoreaddons_desktop_to_json(k3blameencoder "k3blameencoder.desktop" SERVICE_TYPES ${CMAKE_SOURCE_DIR}/libk3b/plugin/k3bplugin.desktop)
+kcoreaddons_add_plugin(k3blameencoder
+    SOURCES k3blameencoder.cpp
+    INSTALL_NAMESPACE "k3b"
+    JSON "k3blameencoder.json")
 
 target_link_libraries(k3blameencoder
     k3bdevice

plugins/encoder/ogg/CMakeLists.txt

-kcoreaddons_add_plugin(k3boggvorbisencoder SOURCES k3boggvorbisencoder.cpp INSTALL_NAMESPACE "k3b")
-kcoreaddons_desktop_to_json(k3boggvorbisencoder "k3boggvorbisencoder.desktop" SERVICE_TYPES ${CMAKE_SOURCE_DIR}/libk3b/plugin/k3bplugin.desktop)
+kcoreaddons_add_plugin(k3boggvorbisencoder
+    SOURCES k3boggvorbisencoder.cpp
+    INSTALL_NAMESPACE "k3b"
+    JSON "k3boggvorbisencoder.json")
 
 target_link_libraries(k3boggvorbisencoder
     k3bdevice

plugins/encoder/sox/CMakeLists.txt

-kcoreaddons_add_plugin(k3bsoxencoder SOURCES k3bsoxencoder.cpp INSTALL_NAMESPACE "k3b")
-kcoreaddons_desktop_to_json(k3bsoxencoder "k3bsoxencoder.desktop" SERVICE_TYPES ${CMAKE_SOURCE_DIR}/libk3b/plugin/k3bplugin.desktop)
+kcoreaddons_add_plugin(k3bsoxencoder
+    SOURCES k3bsoxencoder.cpp
+    INSTALL_NAMESPACE "k3b"
+    JSON "k3bsoxencoder.json")
 
 target_link_libraries(k3bsoxencoder
     k3bdevice

plugins/project/audiometainforenamer/CMakeLists.txt

-kcoreaddons_add_plugin(k3baudiometainforenamerplugin SOURCES k3baudiometainforenamerplugin.cpp INSTALL_NAMESPACE "k3b")
-kcoreaddons_desktop_to_json(k3baudiometainforenamerplugin "k3baudiometainforenamerplugin.desktop" SERVICE_TYPES ${CMAKE_SOURCE_DIR}/libk3b/plugin/k3bplugin.desktop)
+kcoreaddons_add_plugin(k3baudiometainforenamerplugin
+    SOURCES k3baudiometainforenamerplugin.cpp
+    INSTALL_NAMESPACE "k3b"
+    JSON "k3baudiometainforenamerplugin.json")
 
 target_link_libraries(k3baudiometainforenamerplugin
     k3bdevice

plugins/project/audioprojectcddb/CMakeLists.txt

-kcoreaddons_add_plugin(k3baudioprojectcddbplugin SOURCES k3baudioprojectcddbplugin.cpp INSTALL_NAMESPACE "k3b")
-kcoreaddons_desktop_to_json(k3baudioprojectcddbplugin "k3baudioprojectcddbplugin.desktop" SERVICE_TYPES ${CMAKE_SOURCE_DIR}/libk3b/plugin/k3bplugin.desktop)
+kcoreaddons_add_plugin(k3baudioprojectcddbplugin
+    SOURCES k3baudioprojectcddbplugin.cpp
+    INSTALL_NAMESPACE "k3b"
+    JSON "k3baudioprojectcddbplugin.json")
 
 target_link_libraries(k3baudioprojectcddbplugin
     k3bdevice