From 281fbf72f05bded62de3aea09d8b15aa6631901f Mon Sep 17 00:00:00 2001
From: bsavery <brian.savery@gmail.com>
Date: Thu, 7 Sep 2023 17:22:18 +0200
Subject: [PATCH] Cycles: support building with Windows ROCm 5.5 SDK

The official SDK was released, add correct paths for that version. The
old paths can be removed once the buildbot uses this SDK.

The SDK installer sets a HIP_PATH environment variable. This is used to
automatically detect the location when HIP_ROOT_DIR is not manually
specified.

Co-authored-by: Brecht Van Lommel <brecht@blender.org>
Pull Request: https://projects.blender.org/blender/blender/pulls/110519
---
 build_files/cmake/Modules/FindHIP.cmake   | 3 +++
 build_files/cmake/Modules/FindHIPRT.cmake | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/build_files/cmake/Modules/FindHIP.cmake b/build_files/cmake/Modules/FindHIP.cmake
index f8e910735a6..1f93b211573 100644
--- a/build_files/cmake/Modules/FindHIP.cmake
+++ b/build_files/cmake/Modules/FindHIP.cmake
@@ -12,6 +12,9 @@ if(DEFINED HIP_ROOT_DIR AND HIP_ROOT_DIR)
   # Pass.
 elseif(DEFINED ENV{HIP_ROOT_DIR})
   set(HIP_ROOT_DIR $ENV{HIP_ROOT_DIR})
+elseif(DEFINED ENV{HIP_PATH})
+  # Built-in environment variable from SDK.
+  set(HIP_ROOT_DIR $ENV{HIP_PATH})
 else()
   set(HIP_ROOT_DIR "")
 endif()
diff --git a/build_files/cmake/Modules/FindHIPRT.cmake b/build_files/cmake/Modules/FindHIPRT.cmake
index d1ab05e9880..60f97203f5e 100644
--- a/build_files/cmake/Modules/FindHIPRT.cmake
+++ b/build_files/cmake/Modules/FindHIPRT.cmake
@@ -12,6 +12,9 @@ if(DEFINED HIPRT_ROOT_DIR AND HIPRT_ROOT_DIR)
   # Pass.
 elseif(DEFINED ENV{HIPRT_ROOT_DIR})
   set(HIPRT_ROOT_DIR $ENV{HIPRT_ROOT_DIR})
+elseif(DEFINED ENV{HIP_PATH})
+  # Built-in environment variable from SDK.
+  set(HIPRT_ROOT_DIR $ENV{HIP_PATH})
 else()
   set(HIPRT_ROOT_DIR "")
 endif()
@@ -24,6 +27,7 @@ find_path(HIPRT_INCLUDE_DIR
   NAMES
     hiprt/hiprt.h
   HINTS
+    ${_hiprt_SEARCH_DIRS}/include
     ${_hiprt_SEARCH_DIRS}
 )
 
@@ -36,6 +40,7 @@ if(HIPRT_INCLUDE_DIR)
     NAMES
       hiprt${_hiprt_version}_amd_lib_win.bc
     HINTS
+      ${HIPRT_ROOT_DIR}/bin
       ${HIPRT_ROOT_DIR}/dist/bin/Release
     NO_DEFAULT_PATH
   )