From 341d5b374adfe37564c526d0459eacbed582e8a7 Mon Sep 17 00:00:00 2001
From: "Aji, Ashwin" <ashwin.aji@amd.com>
Date: Mon, 10 May 2021 18:58:18 +0000
Subject: [PATCH] ATMI Release for ROCm v4.2

---
 src/device_runtime/CMakeLists.txt | 4 +---
 src/runtime/core/CMakeLists.txt   | 4 +++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/device_runtime/CMakeLists.txt b/src/device_runtime/CMakeLists.txt
index 7282f451..20e15a8f 100644
--- a/src/device_runtime/CMakeLists.txt
+++ b/src/device_runtime/CMakeLists.txt
@@ -80,9 +80,7 @@ find_package_handle_standard_args(
   "One of these files not found: {ockl.bc}"
   ATMI_DE_DEP_LIBHSA_LIBRARIES_DIRS)
 
-if(ATMI_DE_DEP_LIB_FOUND)
-  libatmi_runtime_say("Preparing to build device_runtime with GFX_VER=${GFX_VER}")
-else()
+if(NOT ATMI_DE_DEP_LIB_FOUND)
   libatmi_runtime_say("Not building ATMI Device Runtime: ROCm Device Libs not found.")
   return()
 endif()
diff --git a/src/runtime/core/CMakeLists.txt b/src/runtime/core/CMakeLists.txt
index 16f60004..132a2f6a 100644
--- a/src/runtime/core/CMakeLists.txt
+++ b/src/runtime/core/CMakeLists.txt
@@ -20,12 +20,14 @@ find_path (amd_comgr_INCLUDE_DIRS
     amd_comgr.h
     PATHS
     ${ROCM_INCLUDE_DIRS}
+    ${ROC_DIR}
     ${ROC_COMGR_INCLUDE_DIR}
     ${ROC_COMGR_INCLUDE_DIR}/include
     /opt/rocm/include
     /usr/include
     /usr/local/include
-    ENV CPATH)
+    ENV CPATH
+    PATH_SUFFIXES include)
 
 set(amd_comgr_LIBRARIES amd_comgr)
 include_directories(${amd_comgr_INCLUDE_DIRS})