Git commit 7242e88c634156c38a532637ba04a71c3664b1bd by l10n daemon script, on behalf of Bhushan Shah. Committed on 14/12/2016 at 13:39. Pushed by dfaure into tag 'v5.29.1'.
Additional fix for packages with different types but same ids Fix in 26e59d5843 implemented fully in this. CCMAIL: [email protected] CCMAIL: [email protected] CCMAIL: [email protected] David, sorry, but in addition to 26e59d5843 please include this commit also in new tar (cherry picked from commit 17915200921836d61266ad93dd6c3b87db1dc9e4) M +1 -1 KF5PackageMacros.cmake https://commits.kde.org/kpackage/7242e88c634156c38a532637ba04a71c3664b1bd diff --git a/KF5PackageMacros.cmake b/KF5PackageMacros.cmake index 4a4d081..98044b9 100644 --- a/KF5PackageMacros.cmake +++ b/KF5PackageMacros.cmake @@ -40,7 +40,7 @@ function(kpackage_install_package dir component) set(GENERATED_METADATA "${CMAKE_CURRENT_BINARY_DIR}/${component}-${root}-metadata.json") add_custom_command(OUTPUT ${GENERATED_METADATA} COMMAND KF5::desktoptojson -i ${CMAKE_CURRENT_SOURCE_DIR}/${dir}/metadata.desktop -o ${GENERATED_METADATA}) - add_custom_target(${component}-metadata-json ALL DEPENDS ${GENERATED_METADATA}) + add_custom_target(${component}-${root}-metadata-json ALL DEPENDS ${GENERATED_METADATA}) install(FILES ${GENERATED_METADATA} DESTINATION ${KDE_INSTALL_DATADIR}/${install_dir}/${root}/${component} RENAME metadata.json) endif()
