]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Merge branch 'Applications/15.12'
authorEmmanuel Pescosta <emmanuelpescosta099@gmail.com>
Wed, 16 Mar 2016 20:01:52 +0000 (21:01 +0100)
committerEmmanuel Pescosta <emmanuelpescosta099@gmail.com>
Wed, 16 Mar 2016 20:01:52 +0000 (21:01 +0100)
1  2 
CMakeLists.txt

diff --combined CMakeLists.txt
index c40020fed4992e0d13b63822319ef721c34b9e87,ab4d46481b3f4a8e13accc7b16ffac158161db92..6640b804b0b0723df2cd027ff78ca17885faea6b
@@@ -5,11 -5,11 +5,11 @@@ project(Dolphin
  # KDE Application Version, managed by release script
  set (KDE_APPLICATIONS_VERSION_MAJOR "15")
  set (KDE_APPLICATIONS_VERSION_MINOR "12")
- set (KDE_APPLICATIONS_VERSION_MICRO "1")
+ set (KDE_APPLICATIONS_VERSION_MICRO "3")
  set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}")
  
  set(QT_MIN_VERSION "5.4.0")
 -set(KF5_MIN_VERSION "5.16.0")
 +set(KF5_MIN_VERSION "5.19.0")
  set(ECM_MIN_VERSION "1.6.0")
  
  # ECM setup
@@@ -23,7 -23,7 +23,7 @@@ include(GenerateExportHeader
  include(FeatureSummary)
  include(KDEInstallDirs)
  include(KDECMakeSettings)
 -include(KDEFrameworkCompilerSettings)
 +include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
  
  ecm_setup_version(${KDE_APPLICATIONS_VERSION} VARIABLE_PREFIX DOLPHIN
                    VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/src/dolphin_version.h"
@@@ -86,7 -86,7 +86,7 @@@ set_package_properties(KF5BalooWidgets 
                         TYPE OPTIONAL
                        )
  
 -find_package(KF5FileMetaData 4.97)
 +find_package(KF5FileMetaData 5.19.0)
  set_package_properties(KF5FileMetaData PROPERTIES
                         URL "https://projects.kde.org/kfilemetadata"
                         TYPE OPTIONAL