commit 140b6a7fdc6789865b6c050583495b7180bd1ce0 Author: Lei Su Date: Tue Nov 2 15:00:13 2021 +0800 chore(workaround): builds are not performed under Kwin greater than 5.21 builds are not performed under Kwin greater than 5.21 Log: builds are not performed under Kwin greater than 5.21 Change-Id: I1ecada77a42a956006e5bbe6c9bc5900cd94094a diff --git a/CMakeLists.txt b/CMakeLists.txt index 3c0874d4b..4e2c87707 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -91,8 +91,11 @@ if (KWIN_VERSION) endif() add_subdirectory(configures) -add_subdirectory(plugins) -add_subdirectory(scripts) -add_subdirectory(deepin-wm-dbus) -add_subdirectory(tabbox) -add_subdirectory(tests) +set(DDE_KWIN_SUPPORTED_VERSION "5.21.5") +if (${KWIN_VERSION} STRLESS ${DDE_KWIN_SUPPORTED_VERSION} OR ${KWIN_VERSION} STREQUAL ${DDE_KWIN_SUPPORTED_VERSION}) + add_subdirectory(plugins) + add_subdirectory(scripts) + add_subdirectory(deepin-wm-dbus) + add_subdirectory(tabbox) + add_subdirectory(tests) +endif() diff --git a/configures/kwin_no_scale.in b/configures/kwin_no_scale.in index 8ab0aae87..0be162f0b 100755 --- a/configures/kwin_no_scale.in +++ b/configures/kwin_no_scale.in @@ -1,4 +1,12 @@ #!/bin/sh + +KWIN_VERSION=`kwin_x11 --version 2>/dev/null` +DDE_KWIN_SUPPORTED_VERSION='kwin 5.21.5' +if [ "$KWIN_VERSION" > "$DDE_KWIN_SUPPORTED_VERSION" ]; then + kwin_x11 $@ + exit 0 +fi + if [ -n "$HOME" ];then cp -n /etc/xdg/kglobalshortcutsrc $HOME/.config/kglobalshortcutsrc fi