From 2ec7c2ca33b11ef6d334ffc2972cfaab2a707ae3 Mon Sep 17 00:00:00 2001 From: Jatin Chaudhary <51944368+cjatin@users.noreply.github.com> Date: Tue, 4 Feb 2020 08:59:28 +0530 Subject: [PATCH] Sync hip-targets*.cmake in package with install changes (#1831) Fixes SWDEV-204247 --- hipamd/packaging/hip-targets-release.cmake | 2 -- hipamd/packaging/hip-targets.cmake | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hipamd/packaging/hip-targets-release.cmake b/hipamd/packaging/hip-targets-release.cmake index 735f56ef26..abdbbbee35 100644 --- a/hipamd/packaging/hip-targets-release.cmake +++ b/hipamd/packaging/hip-targets-release.cmake @@ -20,7 +20,6 @@ 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() @@ -37,7 +36,6 @@ 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/hipamd/packaging/hip-targets.cmake b/hipamd/packaging/hip-targets.cmake index 955ad93b6c..b3cbbcec96 100644 --- a/hipamd/packaging/hip-targets.cmake +++ b/hipamd/packaging/hip-targets.cmake @@ -26,6 +26,9 @@ 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() @@ -47,6 +50,7 @@ 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)