[KStandardItemListWidget] Don't paint overlay outside view for devicePixelRatio > 1

[dolphin.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 05c6e9cbe25304f6637fa9302c14d0d1f14b534d..b3fe95b245a9353a2b3508d2d9fd47045ed11173 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,42 +1,49 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.0)

 
 

-project(Dolphin)
+# KDE Application Version, managed by release script
+set (KDE_APPLICATIONS_VERSION_MAJOR "18")
+set (KDE_APPLICATIONS_VERSION_MINOR "03")
+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})

 
 

-set(DOLPHIN_VERSION "14.12.95")
-
-set(QT_MIN_VERSION "5.4.0")
-set(KF5_MIN_VERSION "5.7.0")
+set(QT_MIN_VERSION "5.5.0")
+set(KF5_MIN_VERSION "5.42.0")

 set(ECM_MIN_VERSION "1.6.0")
 
 # ECM setup
 find_package(ECM ${ECM_MIN_VERSION} CONFIG REQUIRED)
 set(ECM_MIN_VERSION "1.6.0")
 
 # ECM setup
 find_package(ECM ${ECM_MIN_VERSION} CONFIG REQUIRED)

-set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
+set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)

 
 include(ECMSetupVersion)
 include(ECMGenerateHeaders)
 
 include(ECMSetupVersion)
 include(ECMGenerateHeaders)

-include(ECMPackageConfigHelpers)
+include(CMakePackageConfigHelpers)

 include(GenerateExportHeader)
 include(FeatureSummary)
 include(KDEInstallDirs)
 include(KDECMakeSettings)
 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"
+)

 
 

-ecm_setup_version(${DOLPHIN_VERSION} VARIABLE_PREFIX DOLPHINVCS
+ecm_setup_version("5.0.0" VARIABLE_PREFIX DOLPHINVCS

                   VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/dolphinvcs_version.h"
                   PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/DolphinVcsConfigVersion.cmake"
                   SOVERSION 5
 )
 
                   VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/dolphinvcs_version.h"
                   PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/DolphinVcsConfigVersion.cmake"
                   SOVERSION 5
 )
 

-ecm_setup_version(${DOLPHIN_VERSION} VARIABLE_PREFIX DOLPHINPRIVATE
+ecm_setup_version("5.0.0" VARIABLE_PREFIX DOLPHINPRIVATE

                   SOVERSION 5
 )
 
 find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
     Core
                   SOVERSION 5
 )
 
 find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
     Core

+    Concurrent

     Widgets
     Gui
     DBus
     Widgets
     Gui
     DBus

-    Test

 )
 
 find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
 )
 
 find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS


@@ -54,11 +61,11 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
     Solid
     IconThemes
     Completion
     Solid
     IconThemes
     Completion

-    TextEditor
-    WindowSystem
+    TextWidgets

     Notifications
     Notifications

+    Crash

 )
 )

-find_package(KF5 ${KF5_MIN_VERSION} COMPONENTS
+find_package(KF5 ${KF5_MIN_VERSION} OPTIONAL_COMPONENTS

     Activities
 )
 
     Activities
 )
 


@@ -77,7 +84,7 @@ set_package_properties(KF5BalooWidgets PROPERTIES DESCRIPTION "Baloos Widgets"
                        TYPE OPTIONAL
                       )
 
                        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
 set_package_properties(KF5FileMetaData PROPERTIES
                        URL "https://projects.kde.org/kfilemetadata"
                        TYPE OPTIONAL


@@ -93,13 +100,15 @@ else()
     )
 endif()
 
     )
 endif()
 

+add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
+

 add_subdirectory(src)
 add_subdirectory(src)

-add_subdirectory(docs)
+add_subdirectory(doc)

 
 # CMake files
 set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/DolphinVcs")
 
 
 # CMake files
 set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/DolphinVcs")
 

-ecm_configure_package_config_file(
+configure_package_config_file(

     "${CMAKE_CURRENT_SOURCE_DIR}/DolphinVcsConfig.cmake.in"
     "${CMAKE_CURRENT_BINARY_DIR}/DolphinVcsConfig.cmake"
     INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
     "${CMAKE_CURRENT_SOURCE_DIR}/DolphinVcsConfig.cmake.in"
     "${CMAKE_CURRENT_BINARY_DIR}/DolphinVcsConfig.cmake"
     INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}


@@ -123,5 +132,10 @@ install(FILES
     COMPONENT Devel
 )
 
     COMPONENT Devel
 )
 

+configure_file(org.kde.dolphin.FileManager1.service.in
+               ${CMAKE_CURRENT_BINARY_DIR}/org.kde.dolphin.FileManager1.service)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.dolphin.FileManager1.service
+        DESTINATION ${DBUS_SERVICES_INSTALL_DIR})
+

 feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
 
 feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)