From d64ba69cf191c43b89aeadfb1187422ada04053e Mon Sep 17 00:00:00 2001 From: David Redondo Date: Thu, 19 Nov 2020 09:40:45 +0100 Subject: [PATCH] Readd searching for breeze decoration Was missed in move from plasma-desktop. We no longer write configs like library=org.kde.breeze theme=kwin4_decoration_qml_plastik BUG:429298 --- CMakeLists.txt | 5 +++++ kcms/lookandfeel/CMakeLists.txt | 11 +++++++++++ kcms/lookandfeel/config-kcm.h.cmake | 4 ++++ 3 files changed, 20 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index b6c6a816c..0f07de40f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -90,6 +90,11 @@ set_package_properties(Phonon4Qt5 PROPERTIES DESCRIPTION "Qt-based audio library" TYPE REQUIRED) +find_package(Breeze ${PROJECT_VERSION} CONFIG) +set_package_properties(Breeze PROPERTIES + TYPE OPTIONAL + PURPOSE "For setting the default window decoration plugin") + find_package(ZLIB) set_package_properties(ZLIB PROPERTIES DESCRIPTION "Support for gzip compressed files and data streams" URL "https://www.zlib.net" diff --git a/kcms/lookandfeel/CMakeLists.txt b/kcms/lookandfeel/CMakeLists.txt index 0a1d170de..96065bf6a 100644 --- a/kcms/lookandfeel/CMakeLists.txt +++ b/kcms/lookandfeel/CMakeLists.txt @@ -4,6 +4,17 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kcm_lookandfeel\") if(X11_Xcursor_FOUND) set(HAVE_XCURSOR TRUE) endif() + +if(${Breeze_FOUND}) + if(${BREEZE_WITH_KDECORATION}) + set(HAVE_BREEZE_DECO true) + else() + set(HAVE_BREEZE_DECO FALSE) + endif() +else() + set(HAVE_BREEZE_DECO FALSE) +endif() + configure_file (config-kcm.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kcm.h ) set(kcm_lookandfeel_SRCS diff --git a/kcms/lookandfeel/config-kcm.h.cmake b/kcms/lookandfeel/config-kcm.h.cmake index 8fcfbef06..91b0dc3e4 100644 --- a/kcms/lookandfeel/config-kcm.h.cmake +++ b/kcms/lookandfeel/config-kcm.h.cmake @@ -1,3 +1,7 @@ #cmakedefine HAVE_XFIXES 1 #cmakedefine HAVE_XCURSOR 1 #cmakedefine HAVE_BREEZE_DECO 1 +#ifdef HAVE_BREEZE_DECO +#define BREEZE_KDECORATION_PLUGIN_ID "${BREEZE_KDECORATION_PLUGIN_ID}" +#endif +