From 1a24452e8b13737a3b9fd57608ac56fe844fd36f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Magnus=20Hellstr=C3=B6mer?= Date: Mon, 18 Nov 2024 20:20:09 +0100 Subject: [PATCH] Bump ECM / KF6 versions --- cmake/fetch_kdeaddons.cmake | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/cmake/fetch_kdeaddons.cmake b/cmake/fetch_kdeaddons.cmake index 24f6ac5eb..4e731ea46 100644 --- a/cmake/fetch_kdeaddons.cmake +++ b/cmake/fetch_kdeaddons.cmake @@ -23,15 +23,16 @@ if(BUILD_WITH_KF6) set(KDE_SKIP_TEST_SETTINGS ON) set(BUILD_DESIGNERPLUGIN OFF) set(KCOREADDONS_USE_QML OFF) - find_package(ECM REQUIRED NO_MODULE) + set(BUILD_QCH OFF) + set(BUILD_SHARED_LIBS OFF) + find_package(ECM 6.8.0 REQUIRED NO_MODULE) list(APPEND CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) - set(ecm_version ${ECM_VERSION}) if(BUILD_KF6) Include(FetchContent) if(NOT DEFINED KF6_GIT_TAG) - set(KF6_GIT_TAG v6.5.0) + set(KF6_GIT_TAG v6.8.0) endif() FetchContent_Declare( @@ -52,12 +53,12 @@ if(BUILD_WITH_KF6) set(kca_version ${KF6CoreAddons_VERSION}) find_package(KF6WidgetsAddons REQUIRED) set(kwa_version ${KF6WidgetsAddons_VERSION}) - endif() + endif() get_target_property(kca_type KF6::WidgetsAddons TYPE) get_target_property(kwa_type KF6::CoreAddons TYPE) - message(NOTICE "ecm version : " ${ecm_version}) + message(NOTICE "ecm version : " ${ECM_VERSION}) message(NOTICE "kcoreaddons library : " ${kca_type}) message(NOTICE "kcoreaddons version : " ${kca_version}) message(NOTICE "kwidgetsaddons library : " ${kwa_type})