]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Merge branch 'Applications/19.08'
authorWolfgang Bauer <wbauer@tmo.at>
Wed, 7 Aug 2019 16:11:51 +0000 (18:11 +0200)
committerWolfgang Bauer <wbauer@tmo.at>
Wed, 7 Aug 2019 16:11:51 +0000 (18:11 +0200)
1  2 
CMakeLists.txt

diff --combined CMakeLists.txt
index a76dda9ceb07d7848e8e4e0f244938a71e11eb7f,838ca1445cb015a2253eba668a735545be71b451..8f2a118ce2df3188a214a83a8c57ffddc59701ab
@@@ -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 "07")
 -set (KDE_APPLICATIONS_VERSION_MICRO "90")
 +set (KDE_APPLICATIONS_VERSION_MINOR "11")
 +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})
  
@@@ -150,7 -150,7 +150,7 @@@ configure_file(org.kde.dolphin.FileMana
  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.dolphin.FileManager1.service
          DESTINATION ${DBUS_SERVICES_INSTALL_DIR})
  
- if (ECM_VERSION VERSION_GREATER_EQUAL "5.59.0")
+ if (NOT ECM_VERSION VERSION_LESS "5.59.0")
      install(FILES dolphin.categories  DESTINATION  ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
  else()
      install(FILES dolphin.categories  DESTINATION ${KDE_INSTALL_CONFDIR})