diff --git a/CMakeLists.txt b/CMakeLists.txt index ffc7dad3c3..92b311bfc4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,13 +10,14 @@ project(Dolphin VERSION ${RELEASE_SERVICE_VERSION}) set(QT_MIN_VERSION "5.15.0") set(KF5_MIN_VERSION "5.89.0") -set(CMAKE_CXX_STANDARD 17) -set(CMAKE_CXX_STANDARD_REQUIRED ON) - # ECM setup find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake) +include(KDEInstallDirs) +include(KDECMakeSettings) +include(KDECompilerSettings NO_POLICY_SCOPE) + include(ECMSetupVersion) include(ECMGenerateHeaders) include(ECMGenerateDBusServiceFile) @@ -24,9 +25,6 @@ include(ECMConfiguredInstall) include(CMakePackageConfigHelpers) include(GenerateExportHeader) include(FeatureSummary) -include(KDEInstallDirs) -include(KDECMakeSettings) -include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(ECMQtDeclareLoggingCategory) ecm_setup_version(${RELEASE_SERVICE_VERSION} VARIABLE_PREFIX DOLPHIN @@ -140,8 +138,12 @@ else() set(HAVE_TERMINAL TRUE) endif() -add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00) -add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055800) +add_definitions( + -DQT_DISABLE_DEPRECATED_BEFORE=0x050f00 + -DQT_DEPRECATED_WARNINGS_SINCE=0x060000 + -DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055800 + -DKF_DEPRECATED_WARNINGS_SINCE=0x060000 +) add_subdirectory(src) add_subdirectory(doc)