Git commit 5691771806221890b1ff9a8d401d778633ca6130 by Luca Beltrame. Committed on 13/02/2017 at 16:21. Pushed by lbeltrame into branch 'Plasma/5.9'.
Revert "No need for WITH_GTK3_VERSION anymore" This reverts commit 5328755bf3dc4261ecca6e705009faefa2b87339. Changing build requirements in a stable release is a great way to annoy distributions and violates the principle of least surprise. CCMAIL: ro...@garg.io CCMAIL: plasma-devel@kde.org M +1 -1 Breeze-dark-gtk/CMakeLists.txt M +1 -1 Breeze-gtk/CMakeLists.txt M +2 -0 CMakeLists.txt https://commits.kde.org/breeze-gtk/5691771806221890b1ff9a8d401d778633ca6130 diff --git a/Breeze-dark-gtk/CMakeLists.txt b/Breeze-dark-gtk/CMakeLists.txt index 15fbb2f..4cafdd8 100644 --- a/Breeze-dark-gtk/CMakeLists.txt +++ b/Breeze-dark-gtk/CMakeLists.txt @@ -3,7 +3,7 @@ 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}) -if (PKG_GTK_VERSION VERSION_LESS "3.20") +if (WITH_GTK3_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/) diff --git a/Breeze-gtk/CMakeLists.txt b/Breeze-gtk/CMakeLists.txt index 5096c28..957665f 100644 --- a/Breeze-gtk/CMakeLists.txt +++ b/Breeze-gtk/CMakeLists.txt @@ -3,7 +3,7 @@ install(DIRECTORY gtk-2.0 DESTINATION ${KDE_INSTALL_FULL_DATAROOTDIR}/themes/Bre install(DIRECTORY assets DESTINATION ${KDE_INSTALL_FULL_DATAROOTDIR}/themes/Breeze ${directory_EXCLUDES}) -if (PKG_GTK_VERSION VERSION_LESS "3.20") +if (WITH_GTK3_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/) diff --git a/CMakeLists.txt b/CMakeLists.txt index 930ad61..db52ea5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,6 +13,8 @@ find_package(GTKEngine) find_package(PkgConfig) pkg_check_modules(PKG_GTK REQUIRED gtk+-3.0) +set(WITH_GTK3_VERSION ${PKG_GTK_VERSION}) + include(KDEInstallDirs) # Exclude these patterns when installing directories as they have no use
