From d7371306b0709d03f4dc5a0beb470804902a42f3 Mon Sep 17 00:00:00 2001 From: Jacob Lambert Date: Tue, 14 Jan 2025 12:12:21 -0800 Subject: [PATCH] SWDEV-360440 - Prepare CLR CMake for Comgr V3 transition Change-Id: Ia279928fd3549a45bae561d0d2d8fcf110d8c245 [ROCm/clr commit: 1fc7c6bb9ab6714b4c867920d8cce1a209b29d6b] --- projects/clr/rocclr/cmake/ROCclrLC.cmake | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/projects/clr/rocclr/cmake/ROCclrLC.cmake b/projects/clr/rocclr/cmake/ROCclrLC.cmake index 28d3fcfd54..55ffc40169 100644 --- a/projects/clr/rocclr/cmake/ROCclrLC.cmake +++ b/projects/clr/rocclr/cmake/ROCclrLC.cmake @@ -18,7 +18,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -find_package(amd_comgr 2.9 REQUIRED CONFIG +find_package(amd_comgr 2.9 CONFIG PATHS /opt/rocm/ ${ROCM_INSTALL_PATH} @@ -26,6 +26,16 @@ find_package(amd_comgr 2.9 REQUIRED CONFIG cmake/amd_comgr lib/cmake/amd_comgr) +if (NOT amd_comgr_FOUND) + find_package(amd_comgr 3.0 REQUIRED CONFIG + PATHS + /opt/rocm/ + ${ROCM_INSTALL_PATH} + PATH_SUFFIXES + cmake/amd_comgr + lib/cmake/amd_comgr) +endif() + target_compile_definitions(rocclr PUBLIC WITH_LIGHTNING_COMPILER USE_COMGR_LIBRARY) if(BUILD_SHARED_LIBS) target_compile_definitions(rocclr PUBLIC COMGR_DYN_DLL)