From 58ece20d33f78be1dfbf4d3aedae3fe282bc4c21 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Mon, 28 Nov 2022 11:41:17 +0200 Subject: 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. --- rpmio/CMakeLists.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'rpmio') 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 -- cgit v1.2.1