Avoid unnecessary variables for cmake target data, part 1

The foo_SOURCES style isn't really in cmake ethos, and is wholly
unnecessary here: target_sources() achieves the same exact thing in a
slightly more straightforward way.

5 files changed, 23 insertions, 29 deletions

diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt
index 7155dad67..c63ed5cc7 100644
--- a/build/CMakeLists.txt
+++ b/build/CMakeLists.txt
@@ -1,4 +1,9 @@
-set(librpmbuild_SOURCES 
+add_library(librpmbuild SHARED)
+set_target_properties(librpmbuild PROPERTIES
+	VERSION ${RPM_LIBVERSION}
+	SOVERSION ${RPM_SOVERSION}
+)
+target_sources(librpmbuild PRIVATE
 	build.c files.c misc.c pack.c
 	parseSimpleScript.c parseChangelog.c parseDescription.c
 	parseFiles.c parsePreamble.c parsePrep.c parseReqs.c parseScript.c
@@ -8,12 +13,6 @@ set(librpmbuild_SOURCES
 	speclua.c
 )
 
-add_library(librpmbuild SHARED)
-set_target_properties(librpmbuild PROPERTIES
-	VERSION ${RPM_LIBVERSION}
-	SOVERSION ${RPM_SOVERSION}
-)
-target_sources(librpmbuild PRIVATE ${librpmbuild_SOURCES})
 target_link_libraries(librpmbuild PUBLIC librpmio librpm)
 target_link_libraries(librpmbuild PRIVATE
 	libmisc
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index ae895b9b6..e56b2ccf9 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -4,12 +4,12 @@ set_target_properties(librpm PROPERTIES
 	SOVERSION ${RPM_SOVERSION}
 )
 
-set(librpm_SOURCES
+target_sources(librpm PRIVATE
 	backend/dbi.c backend/dbi.h backend/dummydb.c
 	backend/dbiset.c backend/dbiset.h
 	headerutil.c header.c headerfmt.c header_internal.h
 	rpmdb.c rpmdb_internal.h
-	fprint.c fprint.h tagname.c rpmtd.c
+	fprint.c fprint.h tagname.c rpmtd.c tagtbl.C
 	cpio.c cpio.h depends.c order.c formats.c tagexts.c fsm.c fsm.h
 	manifest.c manifest.h package.c
 	poptALL.c poptI.c poptQV.c psm.c query.c
@@ -27,12 +27,12 @@ set(librpm_SOURCES
 )
 
 if(ENABLE_SQLITE)
-	list(APPEND librpm_SOURCES backend/sqlite.c)
+	target_sources(librpm PRIVATE backend/sqlite.c)
 	target_link_libraries(librpm PRIVATE PkgConfig::SQLITE)
 endif()
 
 if(ENABLE_NDB)
-	list(APPEND librpm_SOURCES
+	target_sources(librpm PRIVATE
 		backend/ndb/glue.c
 		backend/ndb/rpmpkg.c backend/ndb/rpmpkg.h
 		backend/ndb/rpmidx.c backend/ndb/rpmidx.h
@@ -41,7 +41,7 @@ if(ENABLE_NDB)
 endif()
 
 if(ENABLE_BDB_RO)
-	list(APPEND librpm_SOURCES backend/bdb_ro.c)
+	target_sources(librpm PRIVATE backend/bdb_ro.c)
 endif()
 
 if(WITH_ACL)
@@ -57,7 +57,6 @@ add_custom_command(OUTPUT tagtbl.C
 	DEPENDS ${CMAKE_SOURCE_DIR}/include/rpm/rpmtag.h gentagtbl.sh
 )
 
-target_sources(librpm PRIVATE ${librpm_SOURCES} tagtbl.C)
 target_link_libraries(librpm PUBLIC librpmio)
 target_link_libraries(librpm PRIVATE PkgConfig::POPT PkgConfig::LUA)
 
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index 443f94404..ceb3865be 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(_rpm_SOURCES
+Python3_add_library(_rpm
 	rpmmodule.c rpmsystem-py.h
 	header-py.c header-py.h
 	rpmarchive-py.c rpmarchive-py.h
@@ -18,7 +18,6 @@ set(_rpm_SOURCES
 	spec-py.c spec-py.h
 )
 	
-Python3_add_library(_rpm ${_rpm_SOURCES})
 target_link_libraries(_rpm PRIVATE librpmio librpm librpmbuild librpmsign)
 
 install(TARGETS _rpm
diff --git a/rpmio/CMakeLists.txt b/rpmio/CMakeLists.txt
index 7a25b6c12..2961c7b40 100644
--- a/rpmio/CMakeLists.txt
+++ b/rpmio/CMakeLists.txt
@@ -1,26 +1,27 @@
 add_library(librpmio SHARED)
 
-set(librpmio_SOURCES
+target_sources(librpmio PRIVATE
 	argv.c base64.c digest.c expression.c macro.c rpmhook.h rpmhook.c
 	rpmio.c rpmlog.c rpmmalloc.c rgetopt.c rpmpgp.c rpmpgpval.h
 	rpmsq.c rpmsw.c url.c rpmio_internal.h rpmvercmp.c
 	rpmver.c rpmstring.c rpmfileutil.c rpmglob.c rpmkeyring.c
-	rpmstrpool.c rpmmacro_internal.h rpmlua.c rpmlua.h lposix.c)
+	rpmstrpool.c rpmmacro_internal.h rpmlua.c rpmlua.h lposix.c
+)
 
 if (WITH_INTERNAL_OPENPGP)
-	list(APPEND librpmio_SOURCES rpmpgp_internal.h rpmpgp_internal.c)
+	target_sources(librpmio PRIVATE rpmpgp_internal.h rpmpgp_internal.c)
 	if (WITH_OPENSSL)
 		find_package(OpenSSL REQUIRED)
-		list(APPEND librpmio_SOURCES digest_openssl.c)
+		target_sources(librpmio PRIVATE digest_openssl.c)
 		target_link_libraries(librpmio PRIVATE OpenSSL:Crypto)
 	else()
 		pkg_check_modules(LIBGCRYPT REQUIRED IMPORTED_TARGET libgcrypt)
-		list(APPEND librpmio_SOURCES digest_libgcrypt.c)
+		target_sources(librpmio PRIVATE digest_libgcrypt.c)
 		target_link_libraries(librpmio PRIVATE PkgConfig::LIBGCRYPT)
 	endif()
 else()
 	pkg_check_modules(RPMSEQUOIA REQUIRED IMPORTED_TARGET rpm-sequoia)
-	list(APPEND librpmio_SOURCES rpmpgp_sequoia.c)
+	target_sources(librpmio PRIVATE rpmpgp_sequoia.c)
 	target_link_libraries(librpmio PRIVATE PkgConfig::RPMSEQUOIA)
 endif()
 
@@ -28,7 +29,6 @@ set_target_properties(librpmio PROPERTIES
 	VERSION ${RPM_LIBVERSION}
 	SOVERSION ${RPM_SOVERSION}
 )
-target_sources(librpmio PRIVATE ${librpmio_SOURCES})
 target_link_libraries(librpmio PRIVATE
 			PkgConfig::POPT
 			PkgConfig::LUA
diff --git a/sign/CMakeLists.txt b/sign/CMakeLists.txt
index c35aa31bd..cf004a313 100644
--- a/sign/CMakeLists.txt
+++ b/sign/CMakeLists.txt
@@ -1,21 +1,18 @@
-set(librpmsign_SOURCES
-	rpmgensig.c
-)
-
 add_library(librpmsign SHARED)
 set_target_properties(librpmsign PROPERTIES
 	VERSION ${RPM_LIBVERSION}
 	SOVERSION ${RPM_SOVERSION}
 )
+target_sources(librpmsign PRIVATE rpmgensig.c)
+
 target_link_libraries(librpmsign PUBLIC librpmio librpm)
 if (WITH_IMAEVM)
-	list(APPEND librpmsign_SOURCES rpmsignfiles.c)
+	target_sources(librpmsign PRIVATE rpmsignfiles.c)
 	target_link_libraries(librpmsign PRIVATE imaevm)
 endif()
 if (WITH_FSVERITY)
-	list(APPEND librpmsign_SOURCES rpmsignverity.c)
+	target_sources(librpmsign PRIVATE rpmsignverity.c)
 	target_link_libraries(librpmsign PRIVATE PkgConfig::FSVERITY)
 endif()
-target_sources(librpmsign PRIVATE ${librpmsign_SOURCES})
 
 install(TARGETS librpmsign)