4 files changed, 31 insertions, 31 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 82800972..4e85142e 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -1,4 +1,7 @@
-set(libkconfigcore_SRCS
+add_library(KF5ConfigCore)
+add_library(KF5::ConfigCore ALIAS KF5ConfigCore)
+
+target_sources(KF5ConfigCore PRIVATE
    kconfig.cpp
    kconfigbase.cpp
    kconfigdata.cpp
@@ -13,7 +16,7 @@ set(libkconfigcore_SRCS
    kconfigwatcher.cpp
 )
 
-ecm_qt_declare_logging_category(libkconfigcore_SRCS
+ecm_qt_declare_logging_category(KF5ConfigCore
     HEADER kconfig_core_log_settings.h
     IDENTIFIER KCONFIG_CORE_LOG
     CATEGORY_NAME kf.config.core
@@ -24,8 +27,6 @@ ecm_qt_declare_logging_category(libkconfigcore_SRCS
 
 configure_file(config-kconfig.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kconfig.h )
 
-add_library(KF5ConfigCore ${libkconfigcore_SRCS})
-add_library(KF5::ConfigCore ALIAS KF5ConfigCore)
 ecm_generate_export_header(KF5ConfigCore
     BASE_NAME KConfigCore
     GROUP_BASE_NAME KF
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 8f37b6e1..9dad629a 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -1,15 +1,17 @@
-set(libkconfiggui_SRCS
-   kconfiggui.cpp
-   kconfiggroupgui.cpp
-   kconfigloader.cpp
-   kconfigskeleton.cpp
-   kstandardshortcut.cpp
-   kwindowconfig.cpp
+add_library(KF5ConfigGui)
+add_library(KF5::ConfigGui ALIAS KF5ConfigGui)
+
+ecm_create_qm_loader(KF5ConfigGui kconfig5_qt)
+
+target_sources(KF5ConfigGui PRIVATE
+    kconfiggui.cpp
+    kconfiggroupgui.cpp
+    kconfigloader.cpp
+    kconfigskeleton.cpp
+    kstandardshortcut.cpp
+    kwindowconfig.cpp
 )
-ecm_create_qm_loader(libkconfiggui_SRCS kconfig5_qt)
 
-add_library(KF5ConfigGui ${libkconfiggui_SRCS})
-add_library(KF5::ConfigGui ALIAS KF5ConfigGui)
 ecm_generate_export_header(KF5ConfigGui
     BASE_NAME KConfigGui
     GROUP_BASE_NAME KF
diff --git a/src/kconf_update/CMakeLists.txt b/src/kconf_update/CMakeLists.txt
index 917a471b..40fb4ccb 100644
--- a/src/kconf_update/CMakeLists.txt
+++ b/src/kconf_update/CMakeLists.txt
@@ -1,11 +1,12 @@
-########### next target ###############
+add_executable(kconf_update)
+add_executable(KF5::kconf_update ALIAS kconf_update)
 
-set(kconf_update_SRCS
+target_sources(kconf_update PRIVATE
     kconf_update.cpp
     kconfigutils.cpp
-    )
+)
 
-ecm_qt_declare_logging_category(kconf_update_SRCS
+ecm_qt_declare_logging_category(kconf_update
     HEADER kconf_update_debug.h
     IDENTIFIER KCONF_UPDATE_LOG
     CATEGORY_NAME kf.config.kconf_update
@@ -14,8 +15,6 @@ ecm_qt_declare_logging_category(kconf_update_SRCS
     EXPORT KCONFIG
 )
 
-add_executable(kconf_update ${kconf_update_SRCS})
-add_executable(KF5::kconf_update ALIAS kconf_update)
 target_link_libraries(kconf_update Qt5::Core KF5::ConfigCore)
 include(ECMMarkNonGuiExecutable)
 ecm_mark_nongui_executable(kconf_update)
diff --git a/src/kconfig_compiler/CMakeLists.txt b/src/kconfig_compiler/CMakeLists.txt
index 2bd41cec..0e11ee58 100644
--- a/src/kconfig_compiler/CMakeLists.txt
+++ b/src/kconfig_compiler/CMakeLists.txt
@@ -1,6 +1,14 @@
+add_executable(kconfig_compiler)
 
+if(CMAKE_TOOLCHAIN_FILE)
+    if(BUILD_TESTING)
+        message(WARNING "Testing should be disabled on cross-compilation")
+    endif()
+else()
+    add_executable(KF5::kconfig_compiler ALIAS kconfig_compiler)
+endif()
 
-set(kconfig_compiler_SRCS
+target_sources(kconfig_compiler PRIVATE
     KConfigParameters.cpp
     KConfigCodeGeneratorBase.cpp
     KConfigHeaderGenerator.cpp
@@ -9,20 +17,10 @@ set(kconfig_compiler_SRCS
     kconfig_compiler.cpp
 )
 
-
-add_executable(kconfig_compiler ${kconfig_compiler_SRCS})
 set_target_properties(kconfig_compiler PROPERTIES
     OUTPUT_NAME "kconfig_compiler_kf5"
 )
 
-if(CMAKE_TOOLCHAIN_FILE)
-    if(BUILD_TESTING)
-        message(WARNING "Testing should be disabled on cross-compilation")
-    endif()
-else()
-    add_executable(KF5::kconfig_compiler ALIAS kconfig_compiler)
-endif()
-
 target_link_libraries(kconfig_compiler Qt5::Xml)
 
 ecm_mark_nongui_executable(kconfig_compiler)