From 2868c785d8fbfe34f39917efd71e07dd6aa8a6aa Mon Sep 17 00:00:00 2001
From: Jatin Chaudhary <51944368+cjatin@users.noreply.github.com>
Date: Tue, 11 Feb 2020 11:56:57 +0530
Subject: [PATCH] Revert "Sync hip-targets*.cmake in package with install
 changes (#1831)" (#1860)

Fixes SWDEV-222155 & SWDEV-222158
This reverts commit c7562072a336c63926230f694750b9814162d491.

[ROCm/hip commit: ab7526f64c042d4d9a1753d9514401672f65551c]
---
 projects/hip/packaging/hip-targets-release.cmake | 2 ++
 projects/hip/packaging/hip-targets.cmake         | 4 ----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/projects/hip/packaging/hip-targets-release.cmake b/projects/hip/packaging/hip-targets-release.cmake
index abdbbbee35..735f56ef26 100644
--- a/projects/hip/packaging/hip-targets-release.cmake
+++ b/projects/hip/packaging/hip-targets-release.cmake
@@ -20,6 +20,7 @@ set_target_properties(hip::hip_hcc_static PROPERTIES
 else()
 set_target_properties(hip::hip_hcc_static PROPERTIES
   IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX"
+  IMPORTED_LINK_INTERFACE_LIBRARIES_RELEASE "hc_am"
   IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libhip_hcc_static.a"
   )
 endif()
@@ -36,6 +37,7 @@ set_target_properties(hip::hip_hcc PROPERTIES
   )
 else()
 set_target_properties(hip::hip_hcc PROPERTIES
+  IMPORTED_LINK_INTERFACE_LIBRARIES_RELEASE "hcc::hccrt;hcc::hc_am"
   IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libhip_hcc.so"
   IMPORTED_SONAME_RELEASE "libhip_hcc.so"
   )
diff --git a/projects/hip/packaging/hip-targets.cmake b/projects/hip/packaging/hip-targets.cmake
index b3cbbcec96..955ad93b6c 100644
--- a/projects/hip/packaging/hip-targets.cmake
+++ b/projects/hip/packaging/hip-targets.cmake
@@ -26,9 +26,6 @@ foreach(_expectedTarget hip::hip_hcc_static hip::hip_hcc hip::host hip::device)
   endif()
 endforeach()
 if("${_targetsDefined}" STREQUAL "${_expectedTargets}")
-  unset(_targetsDefined)
-  unset(_targetsNotDefined)
-  unset(_expectedTargets)
   set(CMAKE_IMPORT_FILE_VERSION)
   cmake_policy(POP)
   return()
@@ -50,7 +47,6 @@ endif()
 get_filename_component(_DIR "${CMAKE_CURRENT_LIST_DIR}" REALPATH)
 get_filename_component(_IMPORT_PREFIX "${_DIR}/../../../" REALPATH)
 
-
 # Create imported target hip::hip_hcc_static
 add_library(hip::hip_hcc_static STATIC IMPORTED)