[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-release-team
Subject:    [kpackage] /: Additional fix for packages with different types but same ids
From:       Bhushan Shah <null () kde ! org>
Date:       2016-12-14 11:29:51
Message-ID: E1cH7kt-0007HJ-Op () code ! kde ! org
[Download RAW message or body]

Git commit 17915200921836d61266ad93dd6c3b87db1dc9e4 by Bhushan Shah.
Committed on 14/12/2016 at 11:25.
Pushed by bshah into branch 'master'.

Additional fix for packages with different types but same ids

Fix in 26e59d5843 implemented fully in this.

CCMAIL: release-team@kde.org
CCMAIL: distributions@kde.org
CCMAIL: faure@kde.org

David, sorry, but in addition to 26e59d5843 please include this commit
also in new tar

M  +1    -1    KF5PackageMacros.cmake

https://commits.kde.org/kpackage/17915200921836d61266ad93dd6c3b87db1dc9e4

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()  


[prev in list] [next in list] [prev in thread] [next in thread]