From e8d53a31eec13aa16ab8b60678e120149627030b Mon Sep 17 00:00:00 2001 From: Ammar ELWazir Date: Wed, 1 Jun 2022 11:59:50 -0500 Subject: [PATCH] Adding missing commits Adding commits found in mainline and not in staging Change-Id: Ib146912d8131fd20c422d0911863faf885828733 [ROCm/roctracer commit: 1680d2c70ef9bd71fd599b03b59609d3883411ca] --- projects/roctracer/CMakeLists.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/projects/roctracer/CMakeLists.txt b/projects/roctracer/CMakeLists.txt index ac61965bc1..12b77c58c2 100644 --- a/projects/roctracer/CMakeLists.txt +++ b/projects/roctracer/CMakeLists.txt @@ -100,6 +100,7 @@ else() endif() message("Using CPACK_DEBIAN_PACKAGE_RELEASE ${CPACK_DEBIAN_PACKAGE_RELEASE}") set(CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT") +set(CPACK_DEBIAN_PACKAGE_DEPENDS "rocm-core") ## RPM package specific variables if(DEFINED ENV{CPACK_RPM_PACKAGE_RELEASE}) @@ -109,7 +110,7 @@ else() endif() message("Using CPACK_RPM_PACKAGE_RELEASE ${CPACK_RPM_PACKAGE_RELEASE}") -set( CPACK_RPM_PACKAGE_LICENSE "MIT") +set(CPACK_RPM_PACKAGE_LICENSE "MIT") ## 'dist' breaks manual builds on debian systems due to empty Provides execute_process(COMMAND rpm --eval %{?dist} @@ -122,8 +123,14 @@ if(PROC_RESULT EQUAL "0" AND NOT EVAL_RESULT STREQUAL "") string(APPEND CPACK_RPM_PACKAGE_RELEASE "%{?dist}") endif() set(CPACK_RPM_FILE_NAME "RPM-DEFAULT") +set(CPACK_RPM_PACKAGE_REQUIRES "rocm-core") message("CPACK_RPM_PACKAGE_RELEASE: ${CPACK_RPM_PACKAGE_RELEASE}") +if(NOT ROCM_DEP_ROCMCORE) + string(REGEX REPLACE ",? ?rocm-core" "" CPACK_RPM_PACKAGE_REQUIRES ${CPACK_RPM_PACKAGE_REQUIRES}) + string(REGEX REPLACE ",? ?rocm-core" "" CPACK_DEBIAN_PACKAGE_DEPENDS ${CPACK_DEBIAN_PACKAGE_DEPENDS}) +endif() + include(CPack) endif()