]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Merge branch 'Applications/19.04'
authorNate Graham <nate@kde.org>
Sun, 17 Mar 2019 22:12:38 +0000 (16:12 -0600)
committerNate Graham <nate@kde.org>
Sun, 17 Mar 2019 22:12:38 +0000 (16:12 -0600)
1  2 
CMakeLists.txt

diff --combined CMakeLists.txt
index 5e5a11a172c7c22fa13daa6c155d4ba257736b04,72ab75d365b573ef633e7c257520a57b24bc0345..3408153ec555ec305e33b2fb6588b83a8f2b7b1e
@@@ -2,8 -2,8 +2,8 @@@ cmake_minimum_required(VERSION 3.0
  
  # KDE Application Version, managed by release script
  set (KDE_APPLICATIONS_VERSION_MAJOR "19")
 -set (KDE_APPLICATIONS_VERSION_MINOR "03")
 -set (KDE_APPLICATIONS_VERSION_MICRO "80")
 +set (KDE_APPLICATIONS_VERSION_MINOR "07")
 +set (KDE_APPLICATIONS_VERSION_MICRO "70")
  set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}")
  project(Dolphin VERSION ${KDE_APPLICATIONS_VERSION})
  
@@@ -142,5 -142,7 +142,7 @@@ install(FILES ${CMAKE_CURRENT_BINARY_DI
  
  install( FILES dolphin.categories DESTINATION ${KDE_INSTALL_CONFDIR} )
  
+ install( FILES dolphin.khotkeys DESTINATION ${KDE_INSTALL_DATADIR}/khotkeys )
  feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)