From 57746be66e7dfb3bbc0a53a8d2ca222c37992dcb Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 7 Sep 2023 23:45:57 +0200 Subject: [PATCH] kpmcore: factor out sometimes-needed dependencies --- CMakeModules/KPMcoreHelper.cmake | 4 ++++ src/modules/fsresizer/CMakeLists.txt | 4 ---- src/modules/partition/CMakeLists.txt | 4 ---- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/CMakeModules/KPMcoreHelper.cmake b/CMakeModules/KPMcoreHelper.cmake index 969d354bb..ce1071160 100644 --- a/CMakeModules/KPMcoreHelper.cmake +++ b/CMakeModules/KPMcoreHelper.cmake @@ -11,6 +11,10 @@ # library, which will add definition WITHOUT_KPMcore. # if(NOT TARGET calapmcore) + find_package(${kfname}Config CONFIG) + find_package(${kfname}I18n CONFIG) + find_package(${kfname}WidgetsAddons CONFIG) + if(NOT WITH_QT6) # TODO: Qt6 how to detect the version of Qt that KPMCore needs? find_package(KPMcore 20.04.0) diff --git a/src/modules/fsresizer/CMakeLists.txt b/src/modules/fsresizer/CMakeLists.txt index f4c94bc8b..43ba6d6d4 100644 --- a/src/modules/fsresizer/CMakeLists.txt +++ b/src/modules/fsresizer/CMakeLists.txt @@ -3,10 +3,6 @@ # SPDX-FileCopyrightText: 2020 Adriaan de Groot # SPDX-License-Identifier: BSD-2-Clause # -find_package(KF5Config CONFIG) -find_package(KF5I18n CONFIG) -find_package(KF5WidgetsAddons CONFIG) - include(KPMcoreHelper) if(KPMcore_FOUND) diff --git a/src/modules/partition/CMakeLists.txt b/src/modules/partition/CMakeLists.txt index 159315921..a0f5a1fb1 100644 --- a/src/modules/partition/CMakeLists.txt +++ b/src/modules/partition/CMakeLists.txt @@ -45,10 +45,6 @@ find_package(ECM ${ECM_VERSION} REQUIRED NO_MODULE) include(KPMcoreHelper) -find_package(${kfname}Config CONFIG) -find_package(${kfname}I18n CONFIG) -find_package(${kfname}WidgetsAddons CONFIG) - if(KPMcore_FOUND) include_directories(${PROJECT_BINARY_DIR}/src/libcalamaresui)