From d4e5ff1ea188ec5a808b41b1818cff97d63ed580 Mon Sep 17 00:00:00 2001
From: ROCm CI Service Account <66695075+rocm-ci@users.noreply.github.com>
Date: Tue, 7 Feb 2023 00:42:53 +0530
Subject: [PATCH] SWDEV-356879 - find_dependency instead of hsa path search
 (#3139)

Change-Id: I728c11146eb355b72ec0e01b20832787b93afb5b

[ROCm/hip commit: 0a20904eb6b93a06f6cd4b6cb690a96f46c1d0f5]
---
 projects/hip/hip-lang-config.cmake.in | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/projects/hip/hip-lang-config.cmake.in b/projects/hip/hip-lang-config.cmake.in
index 46050ca1bd..cee1b0e76b 100644
--- a/projects/hip/hip-lang-config.cmake.in
+++ b/projects/hip/hip-lang-config.cmake.in
@@ -72,23 +72,6 @@ get_filename_component(_DIR "${CMAKE_CURRENT_LIST_FILE}" REALPATH)
 get_filename_component(_IMPORT_PREFIX "${_DIR}/../../../../" ABSOLUTE)
 
 
-#If HIP isnot installed under ROCm, need this to find HSA assuming HSA is under ROCm
-if( DEFINED ENV{ROCM_PATH} )
-  set(ROCM_PATH "$ENV{ROCM_PATH}")
-endif()
-
-#if HSA is not under ROCm then provide CMAKE_PREFIX_PATH=<HSA_PATH>
-find_path(HSA_HEADER hsa/hsa.h
-  PATHS
-    "${_IMPORT_PREFIX}/include"
-    "${ROCM_PATH}/include"
-)
-
-if (NOT HSA_HEADER)
-  message (FATAL_ERROR "HSA header not found! ROCM_PATH environment not set")
-endif()
-
-
 set_target_properties(hip-lang::device PROPERTIES
   INTERFACE_INCLUDE_DIRECTORIES "$<$<COMPILE_LANGUAGE:HIP>:${_IMPORT_PREFIX}/include>"
   INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "$<$<COMPILE_LANGUAGE:HIP>:${_IMPORT_PREFIX}/include>"
@@ -96,8 +79,8 @@ set_target_properties(hip-lang::device PROPERTIES
 
 set_target_properties(hip-lang::amdhip64 PROPERTIES
   INTERFACE_COMPILE_DEFINITIONS "$<$<COMPILE_LANGUAGE:HIP>:__HIP_ROCclr__=1>"
-  INTERFACE_INCLUDE_DIRECTORIES "$<$<COMPILE_LANGUAGE:HIP>:${_IMPORT_PREFIX}/include;${HSA_HEADER}>"
-  INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "$<$<COMPILE_LANGUAGE:HIP>:${_IMPORT_PREFIX}/include;${HSA_HEADER}>"
+  INTERFACE_INCLUDE_DIRECTORIES "$<$<COMPILE_LANGUAGE:HIP>:${_IMPORT_PREFIX}/include>"
+  INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "$<$<COMPILE_LANGUAGE:HIP>:${_IMPORT_PREFIX}/include>"
 )
 set_target_properties(hip-lang::device PROPERTIES
   INTERFACE_COMPILE_DEFINITIONS "$<$<COMPILE_LANGUAGE:HIP>:__HIP_ROCclr__=1>"