This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goplasmabindings. commit 271f301c6544edb25f679700ba1980e0f4ce64dc Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Aug 12 06:37:59 2023 +0200 CMakeLists.txt: actually fix the issue by moving the code below the invocation of plasma_install_package (). The target we're checking for is only available after this macro has executed, so what we want to do must also be done after calling it. --- CMakeLists.txt | 22 ++++++++++++---------- debian/changelog | 4 ++++ 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 97a9c78..b632016 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -218,16 +218,6 @@ if (USE_PLASMA5) "${CMAKE_SOURCE_DIR}/package/metadata.desktop" VERBATIM ) - - # For very old systems, make sure that the desktop file exists - # before they try to run desktoptojson on it... - if (TARGET org.x2go.plasmoid-metadata-json) - message (STATUS "Target org.x2go.plasmoid-metadata-json exists, adding CopyDesktopFile target as a dependency ...") - add_dependencies ( - org.x2go.plasmoid-metadata-json - CopyDesktopFile - ) - endif (TARGET org.x2go.plasmoid-metadata-json) endif (USE_DESKTOP_FILE) else (USE_PLASMA5) kde4_add_plugin( @@ -257,6 +247,18 @@ if (USE_PLASMA5) "plasmoids" "applet" ) + + if (USE_DESKTOP_FILE) + # For very old systems, make sure that the desktop file exists + # before they try to run desktoptojson on it... + if (TARGET org.x2go.plasmoid-metadata-json) + message (STATUS "Target org.x2go.plasmoid-metadata-json exists, adding CopyDesktopFile target as a dependency ...") + add_dependencies ( + org.x2go.plasmoid-metadata-json + CopyDesktopFile + ) + endif (TARGET org.x2go.plasmoid-metadata-json) + endif (USE_DESKTOP_FILE) else (USE_PLASMA5) kde4_install_icons( ${ICON_INSTALL_DIR} diff --git a/debian/changelog b/debian/changelog index f7f298a..a2d120d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -52,6 +52,10 @@ x2goplasmabindings (3.0.2.3-0x2go1) UNRELEASED; urgency=medium CopyDesktopFile before desktoptojson is called on it. - CMakeLists.txt: add a debugging message to see if the desktoptojson target actually exists (at that point in time). + - CMakeLists.txt: actually fix the issue by moving the code below + the invocation of plasma_install_package (). The target we're checking + for is only available after this macro has executed, so what we want to + do must also be done after calling it. * x2goplasmabindings.spec: + Prepare for Plasma 5 support. + Stop duplicating Group tag. -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goplasmabindings.git