Commit 06c76141 authored by Luca Beltrame's avatar Luca Beltrame

Revert "Reverse my previous revert, and eliminate the attempted installation...

Revert "Reverse my previous revert, and eliminate the attempted installation of the other Gtk 3 theme versions"

This reverts commit 19ce2441. It breaks
completely installation of themes: the wrong theme is installed (in case
of GTK+-3.20, the 3.18 version is installed) and this causes issues and
major visual artifacts.

Detected by openQA.

CCBUG: 388018
CCMAIL: bcooksley@kde.org
parent 180eeca3
......@@ -3,4 +3,8 @@ install(DIRECTORY gtk-2.0 DESTINATION ${KDE_INSTALL_FULL_DATAROOTDIR}/themes/Bre
install(DIRECTORY assets DESTINATION ${KDE_INSTALL_FULL_DATAROOTDIR}/themes/Breeze-Dark
${directory_EXCLUDES})
install(DIRECTORY gtk-3.0 DESTINATION ${KDE_INSTALL_FULL_DATAROOTDIR}/themes/Breeze-Dark)
if (PKG_GTK_VERSION VERSION_LESS "3.20")
install(FILES gtk-3.18/gtk.css DESTINATION ${KDE_INSTALL_FULL_DATAROOTDIR}/themes/Breeze-Dark/gtk-3.0/)
else()
install(FILES gtk-3.20/gtk.css DESTINATION ${KDE_INSTALL_FULL_DATAROOTDIR}/themes/Breeze-Dark/gtk-3.0/)
endif()
......@@ -3,4 +3,8 @@ install(DIRECTORY gtk-2.0 DESTINATION ${KDE_INSTALL_FULL_DATAROOTDIR}/themes/Bre
install(DIRECTORY assets DESTINATION ${KDE_INSTALL_FULL_DATAROOTDIR}/themes/Breeze
${directory_EXCLUDES})
install(DIRECTORY gtk-3.0 DESTINATION ${KDE_INSTALL_FULL_DATAROOTDIR}/themes/Breeze)
if (PKG_GTK_VERSION VERSION_LESS "3.20")
install(FILES gtk-3.18/gtk.css DESTINATION ${KDE_INSTALL_FULL_DATAROOTDIR}/themes/Breeze/gtk-3.0/)
else()
install(FILES gtk-3.20/gtk.css DESTINATION ${KDE_INSTALL_FULL_DATAROOTDIR}/themes/Breeze/gtk-3.0/)
endif()
......@@ -10,6 +10,9 @@ include(FeatureSummary)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} "${CMAKE_SOURCE_DIR}/cmake")
find_package(GTKEngine)
find_package(PkgConfig)
pkg_check_modules(PKG_GTK REQUIRED gtk+-3.0)
include(KDEInstallDirs)
# Exclude these patterns when installing directories as they have no use
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment