From 0d404124799527c1a1b919aba1ebfd121164056e Mon Sep 17 00:00:00 2001 From: "Galantsev, Dmitrii" Date: Thu, 30 May 2024 16:41:00 -0500 Subject: [PATCH] SWDEV-464886 - Fix ASAN REGEX error in cmake Change-Id: Iaa5deed3ac833ebf1a010b98cfd4493359653ffe Signed-off-by: Galantsev, Dmitrii [ROCm/rocm_smi_lib commit: 10f3c2325c90561f6d16e13fd2d6b1f1a1763490] --- projects/rocm-smi-lib/CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/projects/rocm-smi-lib/CMakeLists.txt b/projects/rocm-smi-lib/CMakeLists.txt index ff5d76e140..b1fe05a4c7 100755 --- a/projects/rocm-smi-lib/CMakeLists.txt +++ b/projects/rocm-smi-lib/CMakeLists.txt @@ -188,13 +188,18 @@ set(CPACK_DEBIAN_PACKAGE_PROVIDES "${ROCM_SMI_PACKAGE}") set(CPACK_RPM_PACKAGE_PROVIDES "${CPACK_DEBIAN_PACKAGE_PROVIDES}") # Add dependencies +# no rocm-core +# python doesn't need to be asan set(CPACK_DEBIAN_PACKAGE_DEPENDS "python3") +set(CPACK_DEBIAN_ASAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}") # Only add dependency on rocm-core if -DROCM_DEP_ROCMCORE=ON is given -# carefully reuse DEB's "DEPENDS" for RPM's "REQUIRES" if(ROCM_DEP_ROCMCORE) set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}, rocm-core") + # rocm-core needs to be asan + # override original variable because CPACK_DEBIAN_PACKAGE_DEPENDS changed set(CPACK_DEBIAN_ASAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}-asan") endif() +# carefully reuse DEB's "DEPENDS" for RPM's "REQUIRES" set(CPACK_RPM_PACKAGE_REQUIRES "${CPACK_DEBIAN_PACKAGE_DEPENDS}") set(CPACK_RPM_ASAN_PACKAGE_REQUIRES "${CPACK_DEBIAN_ASAN_PACKAGE_DEPENDS}")