From de579ad9d835f08be86c3cb64f57f0d7d00115e9 Mon Sep 17 00:00:00 2001 From: Jeremy Newton Date: Wed, 22 Dec 2021 11:04:02 -0500 Subject: [PATCH] SWDEV-316087 - Fix ROCM_DEP_ROCMCORE logic ROCM_DEP_ROCMCORE is not passed to the packaging cmake files, so rocm-core is never added to the dependency list, even if it's set. Signed-off-by: Jeremy Newton Change-Id: I57ec415b5e2b816f8bc226a66643ca0a808e9a35 [ROCm/clr commit: 3898530e2c61db88ddf5759c9b9af45ecba5c162] --- projects/clr/opencl/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/clr/opencl/CMakeLists.txt b/projects/clr/opencl/CMakeLists.txt index 4b582abb63..4464ed0ee9 100644 --- a/projects/clr/opencl/CMakeLists.txt +++ b/projects/clr/opencl/CMakeLists.txt @@ -69,7 +69,7 @@ configure_file(packaging/rocm-ocl-icd.postinst ${BUILD_DIR}/postinst @ONLY) configure_file(packaging/rocm-ocl-icd.prerm ${BUILD_DIR}/prerm @ONLY) configure_file(packaging/rocm-ocl-icd.rpm_post ${BUILD_DIR}/rpm_post @ONLY) configure_file(packaging/rocm-ocl-icd.rpm_postun ${BUILD_DIR}/rpm_postun @ONLY) -add_custom_target(pkg_rocm_ocl_icd COMMAND ${CMAKE_COMMAND} . +add_custom_target(pkg_rocm_ocl_icd COMMAND ${CMAKE_COMMAND} -DROCM_DEP_ROCMCORE=${ROCM_DEP_ROCMCORE} . COMMAND rm -rf *.deb *.rpm *.tar.gz COMMAND make package COMMAND cp *.deb ${PROJECT_BINARY_DIR} @@ -80,7 +80,7 @@ add_custom_target(pkg_rocm_ocl_icd COMMAND ${CMAKE_COMMAND} . # Package: rocm-opencl set(BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/packages/rocm-opencl) configure_file(packaging/rocm-opencl.txt ${BUILD_DIR}/CMakeLists.txt @ONLY) -add_custom_target(pkg_rocm_opencl COMMAND ${CMAKE_COMMAND} . +add_custom_target(pkg_rocm_opencl COMMAND ${CMAKE_COMMAND} -DROCM_DEP_ROCMCORE=${ROCM_DEP_ROCMCORE} . COMMAND rm -rf *.deb *.rpm *.tar.gz COMMAND make package COMMAND cp *.deb ${PROJECT_BINARY_DIR} @@ -91,7 +91,7 @@ add_custom_target(pkg_rocm_opencl COMMAND ${CMAKE_COMMAND} . # Package: rocm-opencl-dev set(BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/packages/rocm-opencl-dev) configure_file(packaging/rocm-opencl-dev.txt ${BUILD_DIR}/CMakeLists.txt @ONLY) -add_custom_target(pkg_rocm_opencl_dev COMMAND ${CMAKE_COMMAND} . +add_custom_target(pkg_rocm_opencl_dev COMMAND ${CMAKE_COMMAND} -DROCM_DEP_ROCMCORE=${ROCM_DEP_ROCMCORE} . COMMAND rm -rf *.deb *.rpm *.tar.gz COMMAND make package COMMAND cp *.deb ${PROJECT_BINARY_DIR}