From ee3139de7e2b1f7eede570aa2cf53eea8b915cf6 Mon Sep 17 00:00:00 2001 From: David Galiffi Date: Fri, 26 Apr 2024 12:45:47 -0400 Subject: [PATCH] Update CMakeLists - Add CPACK_RPM_PACKAGE_RELEASE_DIST to set RPM distro. - Indent packaging logs for easier reading. Signed-off-by: David Galiffi [ROCm/rocprofiler-compute commit: 450370a7677ffd07076f285ad236a77d95d48c8b] --- projects/rocprofiler-compute/CMakeLists.txt | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/projects/rocprofiler-compute/CMakeLists.txt b/projects/rocprofiler-compute/CMakeLists.txt index 8544e3a6ac..0338c3bb22 100644 --- a/projects/rocprofiler-compute/CMakeLists.txt +++ b/projects/rocprofiler-compute/CMakeLists.txt @@ -399,8 +399,13 @@ set(CPACK_PACKAGE_VERSION set(CPACK_RPM_PACKAGE_LICENSE "MIT") set(CPACK_RPM_PACKAGE_PROVIDES "${CPACK_PACKAGE_NAME}") set(CPACK_RPM_COMPONENT_INSTALL ON) +set(CPACK_RPM_PACKAGE_RELEASE_DIST ON) set(CPACK_RPM_FILE_NAME "RPM-DEFAULT") +if(DEFINED CPACK_PACKAGING_INSTALL_PREFIX) + set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "${CPACK_PACKAGING_INSTALL_PREFIX}") +endif() + # Debian package specific variables set(CPACK_DEBIAN_PACKAGE_LICENSE "MIT") set(CPACK_DEB_COMPONENT_INSTALL ON) @@ -436,11 +441,14 @@ else() endif() # Log package info -message(STATUS "Package Version: ${CPACK_PACKAGE_VERSION}") -message(STATUS "RPM Package Release: ${CPACK_RPM_PACKAGE_RELEASE}") -message(STATUS "Debian Package Release: ${CPACK_DEBIAN_PACKAGE_RELEASE}") -message(STATUS "Install Tests: ${INSTALL_TESTS}") -message(STATUS "Package Dependencies: ${PACKAGE_REQUIRES}") +message(STATUS " Package Name: ${CPACK_PACKAGE_NAME}") +message(STATUS " Package Version: ${CPACK_PACKAGE_VERSION}") +message(STATUS " RPM Package Release: ${CPACK_RPM_PACKAGE_RELEASE}") +message(STATUS " Debian Package Release: ${CPACK_DEBIAN_PACKAGE_RELEASE}") +message(STATUS " Packaging Install Prefix: ${CPACK_PACKAGING_INSTALL_PREFIX}") +message(STATUS " Install Tests: ${INSTALL_TESTS}") +message(STATUS " Package Dependencies: ${PACKAGE_REQUIRES}") +message(STATUS " CPack Generator: ${CPACK_GENERATOR}") # Source tarball set(CPACK_SOURCE_GENERATOR "TGZ")