From 43aeeaf836a6e85ac6cb1fece69173be5b3fdc55 Mon Sep 17 00:00:00 2001 From: Ranjith Ramakrishnan Date: Tue, 9 Apr 2024 09:12:45 -0700 Subject: [PATCH] SWDEV-442738 - Link amdhip64 and hiprtc static library with dependent libraries comgr, hsa-runtime and other libraries are linked to amdhip64 and hiprtc static library Change-Id: I1940d8616dcb6a0f8633db3878327fa55b516a1b [ROCm/clr commit: b9fbc98dad844bc9367b9777910492e3d516f77c] --- projects/clr/hipamd/src/CMakeLists.txt | 8 ++++++++ projects/clr/hipamd/src/hiprtc/CMakeLists.txt | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/projects/clr/hipamd/src/CMakeLists.txt b/projects/clr/hipamd/src/CMakeLists.txt index 7e0142975f..31437e87c2 100644 --- a/projects/clr/hipamd/src/CMakeLists.txt +++ b/projects/clr/hipamd/src/CMakeLists.txt @@ -162,6 +162,14 @@ target_include_directories(amdhip64 target_compile_definitions(amdhip64 PRIVATE __HIP_PLATFORM_AMD__) target_link_libraries(amdhip64 PRIVATE ${OPENGL_LIBRARIES}) target_link_libraries(amdhip64 PRIVATE ${CMAKE_DL_LIBS}) +# Add link to comgr, hsa-runtime and other required libraries in target files +# This is required for static libraries +if(NOT BUILD_SHARED_LIBS) + find_package(hsa-runtime64) + find_package(amd_comgr) + target_link_libraries(amdhip64 PRIVATE + pthread numa rt c amd_comgr hsa-runtime64::hsa-runtime64) +endif() # Note in static case we cannot link against rocclr. # If we would, we'd also have to export rocclr and have hipcc pass it to the linker. diff --git a/projects/clr/hipamd/src/hiprtc/CMakeLists.txt b/projects/clr/hipamd/src/hiprtc/CMakeLists.txt index a39294a422..33f8334be5 100644 --- a/projects/clr/hipamd/src/hiprtc/CMakeLists.txt +++ b/projects/clr/hipamd/src/hiprtc/CMakeLists.txt @@ -102,6 +102,14 @@ if(WIN32) endif() target_link_libraries(hiprtc PUBLIC ${CMAKE_DL_LIBS}) +# Add link to comgr, hsa-runtime and other required libraries in target files +# This is required for static libraries +if(NOT BUILD_SHARED_LIBS) + find_package(hsa-runtime64) + find_package(amd_comgr) + target_link_libraries(hiprtc PRIVATE + pthread numa rt c amd_comgr hsa-runtime64::hsa-runtime64) +endif() if(BUILD_SHARED_LIBS) target_link_libraries(hiprtc PRIVATE rocclr)