From fa748e869ddcd4a75f314bfb2ba85b879a3b7e1d Mon Sep 17 00:00:00 2001 From: Aleix Pol Date: Thu, 25 Feb 2016 14:29:19 +0100 Subject: [PATCH] Only build the decoration if the KDecoration2 is present REVIEW: 127174 --- CMakeLists.txt | 12 +++++++++--- kdecoration/CMakeLists.txt | 1 - 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 93ad504f..e7f79bd9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,8 +20,13 @@ else() include(GenerateExportHeader) include(GtkUpdateIconCache) + option(WITH_DECORATIONS "Build Breeze window decorations for KWin" ON) + if(WITH_DECORATIONS) + find_package(KDecoration2 REQUIRED) + add_subdirectory(kdecoration) + endif() + add_subdirectory(cursors) - add_subdirectory(kdecoration) add_subdirectory(kstyle) add_subdirectory(misc) add_subdirectory(qtquickcontrols) @@ -30,8 +35,9 @@ else() INSTALL(FILES colors/Breeze.colors DESTINATION ${DATA_INSTALL_DIR}/color-schemes/) INSTALL(FILES colors/BreezeDark.colors DESTINATION ${DATA_INSTALL_DIR}/color-schemes/) INSTALL(FILES colors/BreezeHighContrast.colors DESTINATION ${DATA_INSTALL_DIR}/color-schemes/) - find_package(KF5Plasma CONFIG REQUIRED) - plasma_install_package(lookandfeel.dark org.kde.breezedark.desktop look-and-feel lookandfeel) + + find_package(KF5Package CONFIG REQUIRED) + kpackage_install_package(lookandfeel.dark org.kde.breezedark.desktop look-and-feel lookandfeel) if(EXISTS ${CMAKE_SOURCE_DIR}/po AND IS_DIRECTORY ${CMAKE_SOURCE_DIR}/po) find_package(KF5I18n CONFIG REQUIRED) ki18n_install(po) diff --git a/kdecoration/CMakeLists.txt b/kdecoration/CMakeLists.txt index 668371b1..5f8a873d 100644 --- a/kdecoration/CMakeLists.txt +++ b/kdecoration/CMakeLists.txt @@ -1,6 +1,5 @@ add_definitions(-DTRANSLATION_DOMAIN="breeze_kwin_deco") -find_package(KDecoration2 REQUIRED) find_package(KF5 REQUIRED COMPONENTS CoreAddons GuiAddons ConfigWidgets WindowSystem I18n) find_package(Qt5 CONFIG REQUIRED COMPONENTS DBus)