[breeze] /: Only build the decoration if the KDecoration2 is present

[šumski]

On Thursday 25 of February 2016 14:29:22 Aleix Pol wrote:
> Git commit fa748e869ddcd4a75f314bfb2ba85b879a3b7e1d by Aleix Pol.
> Committed on 25/02/2016 at 13:29.
> Pushed by apol into branch 'master'.
> 
> Only build the decoration if the KDecoration2 is present
> 
> REVIEW: 127174
> 
> M  +9    -3    CMakeLists.txt
> M  +0    -1    kdecoration/CMakeLists.txt
> 
> http://commits.kde.org/breeze/fa748e869ddcd4a75f314bfb2ba85b879a3b7e1d
> 
> diff --git a/CMakeLists.txt b/CMakeLists.txt
> index 93ad504..e7f79bd 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)
...
Hi Aleix,
the change in cmake macro (plasma_install_package/kpackage_install_package) 
now installs breeze-dark into location unknown to plasma. It really needs to 
be in $XDG_DATA_DIRS/plasma/look-and-feel.


Cheers,
Hrvoje