From 3df060529676ae0714188f7e25315cde549481ea Mon Sep 17 00:00:00 2001 From: "Jonathan R. Madsen" Date: Tue, 15 Oct 2024 18:45:51 -0500 Subject: [PATCH] Correct the package name of rocprofiler-sdk (#1126) * Correct the package name of rocprofiler-sdk ROCM VERSION(for ex: 60300) was missing in the package name. Added the same * Use cmake cache string while setting the variable for ROCm Version * correct the cmake-format --------- Co-authored-by: Ranjith Ramakrishnan [ROCm/rocprofiler-sdk commit: 309d53b20b3164304bb31ac011317804a487f041] --- .../cmake/rocprofiler_config_packaging.cmake | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/projects/rocprofiler-sdk/cmake/rocprofiler_config_packaging.cmake b/projects/rocprofiler-sdk/cmake/rocprofiler_config_packaging.cmake index 3570ec1596..02b74ad4b1 100644 --- a/projects/rocprofiler-sdk/cmake/rocprofiler_config_packaging.cmake +++ b/projects/rocprofiler-sdk/cmake/rocprofiler_config_packaging.cmake @@ -197,9 +197,18 @@ set(CPACK_RPM_PACKAGE_LICENSE "MIT") # Prepare final version for the CPACK use # # -------------------------------------------------------------------------------------- # - +# Make proper version for appending Default Value is 99999 +set(ROCM_VERSION_FOR_PACKAGE + "99999" + CACHE STRING "") +if(DEFINED ENV{ROCM_LIBPATCH_VERSION}) + set(ROCM_VERSION_FOR_PACKAGE + "$ENV{ROCM_LIBPATCH_VERSION}" + CACHE STRING "" FORCE) +endif() +# Prepare final version for the CPACK use set(CPACK_PACKAGE_VERSION - "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}" + "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}.${ROCM_VERSION_FOR_PACKAGE}" ) include(CPack)