Paste P564

Masterwork From Distant Lands
ActivePublic

Authored by davidedmundson on Mar 27 2020, 2:50 PM.
diff --git a/kstats/CMakeLists.txt b/kstats/CMakeLists.txt
index 35d821d5..32487f2e 100644
--- a/kstats/CMakeLists.txt
+++ b/kstats/CMakeLists.txt
@@ -7,11 +7,11 @@ set_source_files_properties("ksysguard_iface.xml"
PROPERTIES INCLUDE "../ksysguard-backend/types.h" )
qt5_add_dbus_adaptor(SOURCES "ksysguard_iface.xml" ksysguarddaemon.h KSysGuardDaemon)
-add_library(kstats_core OBJECT ${SOURCES})
+add_library(kstats_core STATIC ${SOURCES})
target_link_libraries(kstats_core Qt5::Core Qt5::DBus KF5::CoreAddons PW5::SysGuardBackend )
-add_executable(kstats main.cpp $<TARGET_OBJECTS:kstats_core>)
-target_link_libraries(kstats Qt5::Core Qt5::DBus KF5::CoreAddons PW5::SysGuardBackend )
+add_executable(kstats main.cpp)
+target_link_libraries(kstats Qt5::Core Qt5::DBus KF5::CoreAddons PW5::SysGuardBackend kstats_core)
install(TARGETS kstats DESTINATION ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/kstats/autotests/CMakeLists.txt b/kstats/autotests/CMakeLists.txt
index 784b4f68..5e8e1547 100644
--- a/kstats/autotests/CMakeLists.txt
+++ b/kstats/autotests/CMakeLists.txt
@@ -10,6 +10,6 @@ qt5_add_dbus_interface(SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/../ksysguard_iface.x
ecm_add_test(
${SOURCES}
- TEST_NAME kstatstest $<TARGET_OBJECTS:kstats_core>
- LINK_LIBRARIES Qt5::Core Qt5::DBus Qt5::Test PW5::SysGuardBackend KF5::CoreAddons
+ TEST_NAME kstatstest
+ LINK_LIBRARIES Qt5::Core Qt5::DBus Qt5::Test PW5::SysGuardBackend KF5::CoreAddons kstats_core
)
davidedmundson edited the content of this paste. (Show Details)Mar 27 2020, 2:50 PM
davidedmundson changed the title of this paste from untitled to Masterwork From Distant Lands.