napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kpmcore: factor out sometimes-needed dependencies

Browse Source
This commit is contained in:
Adriaan de Groot 2023-09-07 23:45:57 +02:00
parent 0d1adc0692
commit 57746be66e
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeModules/KPMcoreHelper.cmake
View File

@ -11,6 +11,10 @@
# library, which will add definition WITHOUT_KPMcore. # library, which will add definition WITHOUT_KPMcore.
# #
if(NOT TARGET calapmcore) if(NOT TARGET calapmcore)
find_package(${kfname}Config CONFIG)
find_package(${kfname}I18n CONFIG)
find_package(${kfname}WidgetsAddons CONFIG)
if(NOT WITH_QT6) if(NOT WITH_QT6)
# TODO: Qt6 how to detect the version of Qt that KPMCore needs? # TODO: Qt6 how to detect the version of Qt that KPMCore needs?
find_package(KPMcore 20.04.0) find_package(KPMcore 20.04.0)

4
src/modules/fsresizer/CMakeLists.txt
View File

@ -3,10 +3,6 @@
# SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org> # SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
# SPDX-License-Identifier: BSD-2-Clause # SPDX-License-Identifier: BSD-2-Clause
# #
find_package(KF5Config CONFIG)
find_package(KF5I18n CONFIG)
find_package(KF5WidgetsAddons CONFIG)
include(KPMcoreHelper) include(KPMcoreHelper)
if(KPMcore_FOUND) if(KPMcore_FOUND)

4
src/modules/partition/CMakeLists.txt
View File

@ -45,10 +45,6 @@ find_package(ECM ${ECM_VERSION} REQUIRED NO_MODULE)
include(KPMcoreHelper) include(KPMcoreHelper)
find_package(${kfname}Config CONFIG)
find_package(${kfname}I18n CONFIG)
find_package(${kfname}WidgetsAddons CONFIG)
if(KPMcore_FOUND) if(KPMcore_FOUND)
include_directories(${PROJECT_BINARY_DIR}/src/libcalamaresui) include_directories(${PROJECT_BINARY_DIR}/src/libcalamaresui)