From 27c111331a21213f88f7bf67bccfe48eaa6a2d4c Mon Sep 17 00:00:00 2001 From: Payam Date: Tue, 25 Feb 2020 02:10:05 -0500 Subject: [PATCH] changed variable name to VDI Change-Id: I9ab338b50714b0df2db1fa485134e1dad80b68c0 [ROCm/clr commit: 02835e559138ac677c70eb3a04b027511bb3b48f] --- projects/clr/hipamd/packaging/hip-targets-release.cmake | 6 +++--- projects/clr/hipamd/packaging/hip-targets.cmake | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/projects/clr/hipamd/packaging/hip-targets-release.cmake b/projects/clr/hipamd/packaging/hip-targets-release.cmake index c45af51bac..942f4f3be7 100644 --- a/projects/clr/hipamd/packaging/hip-targets-release.cmake +++ b/projects/clr/hipamd/packaging/hip-targets-release.cmake @@ -10,7 +10,7 @@ set(CMAKE_IMPORT_FILE_VERSION 1) get_filename_component(_DIR "${CMAKE_CURRENT_LIST_DIR}" REALPATH) get_filename_component(_IMPORT_PREFIX "${_DIR}/../../../" REALPATH) -if(NOT HIP_RUNTIME STREQUAL "vdi") +if(NOT HIP_RUNTIME MATCHES "VDI") # Import target "hip::hip_hcc_static" for configuration "Release" set_property(TARGET hip::hip_hcc_static APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) if(HIP_COMPILER STREQUAL "clang") @@ -32,7 +32,7 @@ endif() # Import target "hip::hip_hcc" for configuration "Release" set_property(TARGET hip::hip_hcc APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) if(HIP_COMPILER STREQUAL "clang") - if(HIP_RUNTIME STREQUAL "vdi") + if(HIP_RUNTIME MATCHES "VDI") set_target_properties(hip::amdhip64 PROPERTIES IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libamdhip64.so" IMPORTED_SONAME_RELEASE "libamdhip64.so") @@ -48,7 +48,7 @@ else() IMPORTED_SONAME_RELEASE "libhip_hcc.so") endif() -if(NOT HIP_RUNTIME STREQUAL "vdi") +if(NOT HIP_RUNTIME MATCHES "VDI") list(APPEND _IMPORT_CHECK_TARGETS hip::hip_hcc ) list(APPEND _IMPORT_CHECK_FILES_FOR_hip::hip_hcc "${_IMPORT_PREFIX}/lib/libhip_hcc.so" ) else() diff --git a/projects/clr/hipamd/packaging/hip-targets.cmake b/projects/clr/hipamd/packaging/hip-targets.cmake index 095c7cf62c..90a76bef0f 100644 --- a/projects/clr/hipamd/packaging/hip-targets.cmake +++ b/projects/clr/hipamd/packaging/hip-targets.cmake @@ -16,7 +16,7 @@ set(CMAKE_IMPORT_FILE_VERSION 1) set(_targetsDefined) set(_targetsNotDefined) set(_expectedTargets) -if(HIP_RUNTIME STREQUAL "vdi") +if(HIP_RUNTIME MATCHES "VDI") foreach(_expectedTarget hip::hip_hcc hip::host hip::device) else() foreach(_expectedTarget hip:hip_hcc_static hip::hip_hcc hip::host hip::device) @@ -52,7 +52,7 @@ get_filename_component(_DIR "${CMAKE_CURRENT_LIST_DIR}" REALPATH) get_filename_component(_IMPORT_PREFIX "${_DIR}/../../../" REALPATH) # Create imported target hip::hip_hcc_static -if( NOT HIP_RUNTIME STREQUAL "vdi") +if( NOT HIP_RUNTIME MATCHES "VDI") add_library(hip::hip_hcc_static STATIC IMPORTED) endif() @@ -68,7 +68,7 @@ find_path(HSA_HEADER hsa/hsa.h if (HSA_HEADER-NOTFOUND) message (FATAL_ERROR "HSA header not found! ROCM_PATH environment not set") endif() -if(HIP_RUNTIME STREQUAL "vdi") +if(HIP_RUNTIME MATCHES "VDI") # Create imported target hip::amdhip64 add_library(hip::amdhip64 SHARED IMPORTED) @@ -93,7 +93,7 @@ endif() # Create imported target hip::host add_library(hip::host INTERFACE IMPORTED) -if(HIP_RUNTIME STREQUAL "vdi") +if(HIP_RUNTIME MATCHES "VDI") set_target_properties(hip::host PROPERTIES INTERFACE_LINK_LIBRARIES "hip::amdhip64") else()