Don't use QIcon::Selected state for selected icon

[dolphin.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1ab84b95053c1e198ac67133366343e4bc629d2a..dd17df6927c2d62e3a1fb97f3f14a19c90a4d624 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,24 +1,22 @@
-cmake_minimum_required(VERSION 2.8.12)
-
-project(Dolphin)
+cmake_minimum_required(VERSION 3.0)

 
 # KDE Application Version, managed by release script
 
 # KDE Application Version, managed by release script

-set (KDE_APPLICATIONS_VERSION_MAJOR "17")
-set (KDE_APPLICATIONS_VERSION_MINOR "11")
-set (KDE_APPLICATIONS_VERSION_MICRO "70")
+set (KDE_APPLICATIONS_VERSION_MAJOR "18")
+set (KDE_APPLICATIONS_VERSION_MINOR "08")
+set (KDE_APPLICATIONS_VERSION_MICRO "1")

 set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}")
 set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}")

+project(Dolphin VERSION ${KDE_APPLICATIONS_VERSION})

 
 

-set(QT_MIN_VERSION "5.5.0")
-set(KF5_MIN_VERSION "5.30.0")
-set(ECM_MIN_VERSION "1.6.0")
+set(QT_MIN_VERSION "5.8.0")
+set(KF5_MIN_VERSION "5.43.0")

 
 # ECM setup
 
 # ECM setup

-find_package(ECM ${ECM_MIN_VERSION} CONFIG REQUIRED)
+find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED)

 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
 
 include(ECMSetupVersion)
 include(ECMGenerateHeaders)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
 
 include(ECMSetupVersion)
 include(ECMGenerateHeaders)

-include(ECMPackageConfigHelpers)
+include(CMakePackageConfigHelpers)

 include(GenerateExportHeader)
 include(FeatureSummary)
 include(KDEInstallDirs)
 include(GenerateExportHeader)
 include(FeatureSummary)
 include(KDEInstallDirs)


@@ -79,7 +77,7 @@ set_package_properties(KF5Baloo PROPERTIES DESCRIPTION "Baloo Core libraries"
                        PURPOSE "For adding desktop-wide search and tagging support to dolphin"
                       )
 
                        PURPOSE "For adding desktop-wide search and tagging support to dolphin"
                       )
 

-find_package(KF5BalooWidgets 4.97)
+find_package(KF5BalooWidgets 18.07.70)

 set_package_properties(KF5BalooWidgets PROPERTIES DESCRIPTION "Baloos Widgets"
                        URL "http://www.kde.org"
                        TYPE OPTIONAL
 set_package_properties(KF5BalooWidgets PROPERTIES DESCRIPTION "Baloos Widgets"
                        URL "http://www.kde.org"
                        TYPE OPTIONAL


@@ -96,20 +94,19 @@ if (KF5Baloo_FOUND AND KF5BalooWidgets_FOUND AND KF5FileMetaData_FOUND)
     message(STATUS "Baloo packages are found")
     set(HAVE_BALOO TRUE)
 else()
     message(STATUS "Baloo packages are found")
     set(HAVE_BALOO TRUE)
 else()

+    message(WARNING "Baloo packages not found. They are needed for the metadata features of Dolphin.")

     find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
         KDELibs4Support # for KFileMetaDataWidget
     )
 endif()
 
     find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
         KDELibs4Support # for KFileMetaDataWidget
     )
 endif()
 

-add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
-

 add_subdirectory(src)
 add_subdirectory(doc)
 
 # CMake files
 set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/DolphinVcs")
 
 add_subdirectory(src)
 add_subdirectory(doc)
 
 # 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}