From 6a4ba6ff2a8dabc04f17897c149fb9b3f6b34ebd Mon Sep 17 00:00:00 2001 From: Chris Freehill Date: Tue, 5 Nov 2019 08:45:57 -0600 Subject: [PATCH] Use "-" instead of "_" for package name This is part of fix to SWDEV-208805. The other part will be in the build_* script. Change-Id: I36397e3f918d08170db8bb228722a2b7389af83b [ROCm/rocm_smi_lib commit: 0e5c44de2ad74119c611d281cb7a3d7b177749f1] --- projects/rocm-smi-lib/CMakeLists.txt | 6 +++++- projects/rocm-smi-lib/cmake_modules/utils.cmake | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/projects/rocm-smi-lib/CMakeLists.txt b/projects/rocm-smi-lib/CMakeLists.txt index d99711d9d1..6d32a5f10e 100755 --- a/projects/rocm-smi-lib/CMakeLists.txt +++ b/projects/rocm-smi-lib/CMakeLists.txt @@ -77,7 +77,11 @@ set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "ROCm System Management Interface library") endif() -set(CPACK_PACKAGE_FILE_NAME "rocm_smi_lib64-${PKG_VERSION_STR}") +if (NOT ROCM_SMI_PACKAGE) + set(ROCM_SMI_PACKAGE rocm_smi_lib64) +endif() + +set(CPACK_PACKAGE_FILE_NAME "${ROCM_SMI_PACKAGE}-${PKG_VERSION_STR}") ## Verbose output. set(CMAKE_VERBOSE_MAKEFILE on) diff --git a/projects/rocm-smi-lib/cmake_modules/utils.cmake b/projects/rocm-smi-lib/cmake_modules/utils.cmake index 5e1c19bd3f..9c9fea5ea4 100755 --- a/projects/rocm-smi-lib/cmake_modules/utils.cmake +++ b/projects/rocm-smi-lib/cmake_modules/utils.cmake @@ -132,7 +132,7 @@ function(get_package_version_number DEFAULT_VERSION_STRING VERSION_PREFIX GIT) if (DEFINED ENV{ROCM_BUILD_ID}) set(VERSION_ID $ENV{ROCM_BUILD_ID}) else() - set(VERSION_ID "local_build-0") + set(VERSION_ID "local-build-0") endif() set(PKG_VERSION_STR "${PKG_VERSION_STR}.${VERSION_ID}")