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

Modules: make use of KF5::CoreAddons explicit

Browse Source
This commit is contained in:
Adriaan de Groot 2022-02-08 16:12:25 +01:00
parent 5160fdc26a
commit e507a23795
3 changed files with 17 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/modules/hostinfo/CMakeLists.txt
View File

@ -23,7 +23,7 @@
# - *hostCPU* the make (brand) of the CPU, if it can be determined.
# Values are "Intel" or "AMD" or blank.
calamares_add_plugin( hostinfo
calamares_add_plugin(hostinfo
TYPE job
EXPORT_MACRO PLUGINDLLEXPORT_PRO
SOURCES
@ -32,15 +32,9 @@ calamares_add_plugin( hostinfo
NO_CONFIG
)
if ( KF5CoreAddons_FOUND AND KF5CoreAddons_VERSION VERSION_GREATER_EQUAL 5.58 )
target_compile_definitions( calamares_job_hostinfo PRIVATE WITH_KOSRelease )
if(KF5CoreAddons_FOUND AND KF5CoreAddons_VERSION VERSION_GREATER_EQUAL 5.58)
target_compile_definitions(calamares_job_hostinfo PRIVATE WITH_KOSRelease)
target_link_libraries(calamares_job_hostinfo PRIVATE KF5::CoreAddons)
endif()
calamares_add_test(
hostinfotest
SOURCES
Tests.cpp
HostInfoJob.cpp
LIBRARIES
yamlcpp::yamlcpp
)
calamares_add_test(hostinfotest SOURCES Tests.cpp HostInfoJob.cpp LIBRARIES yamlcpp::yamlcpp)

21
src/modules/netinstall/CMakeLists.txt
View File

@ -3,7 +3,7 @@
# SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
# SPDX-License-Identifier: BSD-2-Clause
#
calamares_add_plugin( netinstall
calamares_add_plugin(netinstall
TYPE viewmodule
EXPORT_MACRO PLUGINDLLEXPORT_PRO
SOURCES
@ -20,15 +20,10 @@ calamares_add_plugin( netinstall
SHARED_LIB
)
calamares_add_test(
netinstalltest
SOURCES
Tests.cpp
Config.cpp
LoaderQueue.cpp
PackageTreeItem.cpp
PackageModel.cpp
LIBRARIES
Qt5::Gui
)
if(KF5CoreAddons_FOUND)
calamares_add_test(
netinstalltest
SOURCES Tests.cpp Config.cpp LoaderQueue.cpp PackageTreeItem.cpp PackageModel.cpp
LIBRARIES Qt5::Gui KF5::CoreAddons
)
endif()

11
src/modules/tracking/CMakeLists.txt
View File

@ -3,7 +3,7 @@
# SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
# SPDX-License-Identifier: BSD-2-Clause
#
calamares_add_plugin( tracking
calamares_add_plugin(tracking
TYPE viewmodule
EXPORT_MACRO PLUGINDLLEXPORT_PRO
SOURCES
@ -16,11 +16,8 @@ calamares_add_plugin( tracking
RESOURCES
page_trackingstep.qrc
SHARED_LIB
LINK_LIBRARIES
KF5::CoreAddons
)
calamares_add_test(
trackingtest
SOURCES
Tests.cpp
Config.cpp
)
calamares_add_test(trackingtest SOURCES Tests.cpp Config.cpp)