This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goplasmabindings. commit 4fdbc7d1cea80f5b0e44681ab79a3ac6f86bd5e9 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Jun 29 22:22:46 2023 +0200 CMakeLists.txt: only build x2goplasmoidkf5.cpp in Plasma5 mode. --- CMakeLists.txt | 23 +++++++++++++++-------- debian/changelog | 1 + 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1b06afe..8f17477 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,14 +60,21 @@ find_file(HAVE_PLASMA_SEPARATOR separator.h ${KDE4_INCLUDES}/plasma/widgets) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h) # We add our source code here -set( - x2goplasmoid_SRCS - fsitem.cpp - plasmoidhovereditem.cpp - plasmax2godialog.cpp - x2goplasmoid.cpp -) - +if (USE_PLASMA5) + set( + x2goplasmoid_SRCS + x2goplasmoidkf5.cpp + ) +else (USE_PLASMA5) + set( + x2goplasmoid_SRCS + fsitem.cpp + plasmoidhovereditem.cpp + plasmax2godialog.cpp + x2goplasmoid.cpp + ) +endif (USE_PLASMA5) + # Now make sure all files get to the right place if (USE_PLASMA5) add_library ( diff --git a/debian/changelog b/debian/changelog index 8f6695d..d11b5e9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -39,6 +39,7 @@ x2goplasmabindings (3.0.2.3-0x2go1) UNRELEASED; urgency=medium - /: add COPYING.GPL3. - x2goplasmabindings.spec: fix License: tag, add COPYING and COPYING.GPL3 to either %license or %doc macros in %files section. + - CMakeLists.txt: only build x2goplasmoidkf5.cpp in Plasma5 mode. * 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