[X2Go-Commits] [x2goplasmabindings] 01/02: CMakeLists.txt: fix builds on Debian Stretch/9 by depending upon CopyDesktopFile before desktoptojson is called on it.

git-admin at x2go.org git-admin at x2go.org
Sat Aug 12 01:58:55 CEST 2023


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goplasmabindings.

commit 7bac7b42ad41c6b1b94ac53ef12138f9d4ad0772
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Aug 12 01:55:41 2023 +0200

    CMakeLists.txt: fix builds on Debian Stretch/9 by depending upon CopyDesktopFile before desktoptojson is called on it.
---
 CMakeLists.txt   | 9 +++++++++
 debian/changelog | 2 ++
 2 files changed, 11 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index de77544..362725a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -218,6 +218,15 @@ 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)
+			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(
diff --git a/debian/changelog b/debian/changelog
index c3aa5f4..969fa54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -48,6 +48,8 @@ x2goplasmabindings (3.0.2.3-0x2go1) UNRELEASED; urgency=medium
       automatically removes it as well. Only do that if actually requested,
       though.
     - CMakeLists.txt: fix warning due to mismatched if/endif parameters.
+    - CMakeLists.txt: fix builds on Debian Stretch/9 by depending upon
+      CopyDesktopFile before desktoptojson is called on 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


More information about the x2go-commits mailing list