diff --git a/src/modules/hostinfo/CMakeLists.txt b/src/modules/hostinfo/CMakeLists.txt index 55be66f81..af1b3ff45 100644 --- a/src/modules/hostinfo/CMakeLists.txt +++ b/src/modules/hostinfo/CMakeLists.txt @@ -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) diff --git a/src/modules/netinstall/CMakeLists.txt b/src/modules/netinstall/CMakeLists.txt index f31ac6d79..d50eab7b2 100644 --- a/src/modules/netinstall/CMakeLists.txt +++ b/src/modules/netinstall/CMakeLists.txt @@ -3,7 +3,7 @@ # SPDX-FileCopyrightText: 2020 Adriaan de Groot # 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() diff --git a/src/modules/tracking/CMakeLists.txt b/src/modules/tracking/CMakeLists.txt index a878961b0..0dbbeb942 100644 --- a/src/modules/tracking/CMakeLists.txt +++ b/src/modules/tracking/CMakeLists.txt @@ -3,7 +3,7 @@ # SPDX-FileCopyrightText: 2020 Adriaan de Groot # 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)