From 1155dbda1e6ebd74b62fdde7aa0b03be9db08a85 Mon Sep 17 00:00:00 2001
From: Satyanvesh Dittakavi <Satyanvesh.Dittakavi@amd.com>
Date: Tue, 1 Nov 2022 15:29:36 +0000
Subject: [PATCH] SWDEV-364545 - Fix hiprtc cmake target on Windows

Change-Id: I360d0d1ee7f6a0c65a4d6cd07620bfa2a503c19f
---
 hipamd/src/hiprtc/CMakeLists.txt              | 13 ++++---
 hipamd/src/hiprtc/cmake/hiprtc-config.cmake   |  2 -
 .../src/hiprtc/cmake/hiprtc-config.cmake.in   | 39 +++++++++++++++++++
 3 files changed, 47 insertions(+), 7 deletions(-)
 delete mode 100644 hipamd/src/hiprtc/cmake/hiprtc-config.cmake
 create mode 100644 hipamd/src/hiprtc/cmake/hiprtc-config.cmake.in

diff --git a/hipamd/src/hiprtc/CMakeLists.txt b/hipamd/src/hiprtc/CMakeLists.txt
index 0ca91f81d8..33aa1c0cac 100644
--- a/hipamd/src/hiprtc/CMakeLists.txt
+++ b/hipamd/src/hiprtc/CMakeLists.txt
@@ -213,6 +213,12 @@ INSTALL(EXPORT hiprtc-targets NAMESPACE hiprtc:: DESTINATION ${CONFIG_RTC_PACKAG
 #############################
 include(CMakePackageConfigHelpers)
 
+configure_package_config_file(
+  ${CMAKE_CURRENT_SOURCE_DIR}/cmake/hiprtc-config.cmake.in
+  ${PROJECT_BINARY_DIR}/hiprtc-config.cmake
+  INSTALL_DESTINATION ${CONFIG_RTC_PACKAGE_INSTALL_DIR}
+  PATH_VARS LIB_INSTALL_DIR INCLUDE_INSTALL_DIR BIN_INSTALL_DIR)
+
 write_basic_package_version_file(
   ${PROJECT_BINARY_DIR}/hiprtc-config-version.cmake
   VERSION "${HIP_VERSION_MAJOR}.${HIP_VERSION_MINOR}.${HIP_VERSION_GITDATE}"
@@ -223,9 +229,6 @@ INSTALL(FILES ${HIP_COMMON_INCLUDE_DIR}/hip/hiprtc.h DESTINATION "include/hip")
 INSTALL(FILES ${HIP_COMMON_INCLUDE_DIR}/hip/hip_common.h DESTINATION "include/hip")
 
 INSTALL(
-  FILES ${CMAKE_CURRENT_SOURCE_DIR}/cmake/hiprtc-config.cmake
-  DESTINATION ${CONFIG_RTC_PACKAGE_INSTALL_DIR})
-
-INSTALL(
-  FILES ${PROJECT_BINARY_DIR}/hiprtc-config-version.cmake
+  FILES ${PROJECT_BINARY_DIR}/hiprtc-config.cmake
+        ${PROJECT_BINARY_DIR}/hiprtc-config-version.cmake
   DESTINATION ${CONFIG_RTC_PACKAGE_INSTALL_DIR})
diff --git a/hipamd/src/hiprtc/cmake/hiprtc-config.cmake b/hipamd/src/hiprtc/cmake/hiprtc-config.cmake
deleted file mode 100644
index 1930832d9e..0000000000
--- a/hipamd/src/hiprtc/cmake/hiprtc-config.cmake
+++ /dev/null
@@ -1,2 +0,0 @@
-include(CMakeFindDependencyMacro)
-include("${CMAKE_CURRENT_LIST_DIR}/hiprtc-targets.cmake")
diff --git a/hipamd/src/hiprtc/cmake/hiprtc-config.cmake.in b/hipamd/src/hiprtc/cmake/hiprtc-config.cmake.in
new file mode 100644
index 0000000000..5aa911925e
--- /dev/null
+++ b/hipamd/src/hiprtc/cmake/hiprtc-config.cmake.in
@@ -0,0 +1,39 @@
+# Copyright (c) 2022 Advanced Micro Devices, Inc. All Rights Reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+cmake_minimum_required(VERSION 3.3)
+@PACKAGE_INIT@
+include(CMakeFindDependencyMacro)
+set_and_check(hiprtc_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
+set_and_check(hiprtc_LIB_INSTALL_DIR "@PACKAGE_LIB_INSTALL_DIR@")
+set_and_check(hiprtc_BIN_INSTALL_DIR "@PACKAGE_BIN_INSTALL_DIR@")
+
+# Windows Specific Definition here:
+if(WIN32)
+  if(DEFINED ENV{HIP_PATH})
+    file(TO_CMAKE_PATH "$ENV{HIP_PATH}" HIP_PATH)
+  elseif(DEFINED ENV{HIP_DIR})
+    file(TO_CMAKE_PATH "$ENV{HIP_DIR}" HIP_DIR)
+  else()
+    # using the HIP found
+    set(HIP_PATH ${PACKAGE_PREFIX_DIR})
+  endif()
+endif()
+include("${CMAKE_CURRENT_LIST_DIR}/hiprtc-targets.cmake")