]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Merge remote-tracking branch 'origin/Applications/19.04'
authorChristoph Feck <cfeck@kde.org>
Mon, 18 Mar 2019 22:00:25 +0000 (23:00 +0100)
committerChristoph Feck <cfeck@kde.org>
Mon, 18 Mar 2019 22:00:25 +0000 (23:00 +0100)
1  2 
CMakeLists.txt

diff --combined CMakeLists.txt
index 3408153ec555ec305e33b2fb6588b83a8f2b7b1e,09fafe5c9531957fc07cef62aabfc22a2657be43..c522d9a899f6c13b8ac491e0a397b7836c23a78e
@@@ -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})
  
@@@ -68,6 -68,11 +68,11 @@@ find_package(KF5 ${KF5_MIN_VERSION} REQ
  find_package(KF5 ${KF5_MIN_VERSION} OPTIONAL_COMPONENTS
      Activities
  )
+ set_package_properties(KF5Activities PROPERTIES DESCRIPTION "KActivities libraries"
+                        URL "http://www.kde.org"
+                        TYPE OPTIONAL
+                        PURPOSE "For tracking which folders are frequently accessed on a Plasma desktop"
+                       )
  
  find_package(Phonon4Qt5 CONFIG REQUIRED)
  
@@@ -91,6 -96,10 +96,10 @@@ set_package_properties(KF5FileMetaData 
                         PURPOSE "For accessing file metadata labels"
                        )
  
+ if (KF5Activities_FOUND)
+     set(HAVE_KACTIVITIES TRUE)
+ endif()
  if (KF5Baloo_FOUND AND KF5BalooWidgets_FOUND AND KF5FileMetaData_FOUND)
      message(STATUS "Baloo packages are found")
      set(HAVE_BALOO TRUE)