This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2goplasmabindings.
commit 0bc59e0cb8590211d4fe02dacb8c0061adc682e8
Author: Mihai Moldovan <io...@ionic.de>
Date: Thu Jun 29 22:41:10 2023 +0200
CMakeLists.txt: rework building of org.x2go.plasmoid library in Plasma5
mode, based upon QML.
---
CMakeLists.txt | 22 +++++++++++++---------
debian/changelog | 2 ++
2 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8f17477..a3368dd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,6 +15,7 @@ if (USE_PLASMA5)
include (KDECompilerSettings NO_POLICY_SCOPE)
include (FeatureSummary)
include (ECMInstallIcons)
+ include (ECMQmlModule)
find_package (
KF5 REQUIRED COMPONENTS
@@ -26,6 +27,7 @@ if (USE_PLASMA5)
Qt5 CONFIG REQUIRED COMPONENTS
Quick
Core
+ Qml
)
feature_summary (WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
@@ -77,19 +79,21 @@ endif (USE_PLASMA5)
# Now make sure all files get to the right place
if (USE_PLASMA5)
- add_library (
- org.x2go.plasmoid MODULE
- ${x2goplasmoid_SRCS}
+ ecm_add_qml_module (
+ org.x2go.plasmoid URI org.x2go.plasmoid
)
- set_target_properties (
- org.x2go.plasmoid
- PROPERTIES PREFIX ""
+ target_sources (
+ org.x2go.plasmoid PRIVATE
+ ${x2goplasmoid_SRCS}
)
target_link_libraries (
org.x2go.plasmoid
- Qt5::Gui
- KF5::Plasma
- KF5::I18n
+ Qt::Core
+ Qt::Qml
+ )
+ ecm_finalize_qml_module (
+ org.x2go.plasmoid DESTINATION
+ ${KDE_INSTALL_QMLDIR}
)
else (USE_PLASMA5)
kde4_add_plugin(
diff --git a/debian/changelog b/debian/changelog
index f3fabb3..c99979e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -42,6 +42,8 @@ x2goplasmabindings (3.0.2.3-0x2go1) UNRELEASED; urgency=medium
- CMakeLists.txt: only build x2goplasmoidkf5.cpp in Plasma5 mode.
- package/metadata.json: add Robert Tari to authors.
- package/contents/ui: add main.qml, also provided by Robert Tari.
+ - CMakeLists.txt: rework building of org.x2go.plasmoid library in Plasma5
+ mode, based upon QML.
* debian/control:
+ Adapt description to also mention KDE 5.
+ Build-Depend on libkf5plasma-dev and libkf5i18n-dev, with a fallback to
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on
/srv/git/code.x2go.org/x2goplasmabindings.git
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits
