From 942703dfc4df67c5459fbf0efcbf4b4c63b4b5df Mon Sep 17 00:00:00 2001 From: Anusha GodavarthySurya Date: Wed, 30 Jun 2021 02:36:12 -0700 Subject: [PATCH] SWDEV-293455 - Fix nvidia build failure on CI Change-Id: I3fac79c601ba846c6b7d8e5a3b21fdfdf2931c90 --- hipamd/CMakeLists.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/hipamd/CMakeLists.txt b/hipamd/CMakeLists.txt index 0116c9b5fa..55b8adcf46 100755 --- a/hipamd/CMakeLists.txt +++ b/hipamd/CMakeLists.txt @@ -51,8 +51,7 @@ endif() message (STATUS "HIP_COMMON_DIR found at ${HIP_COMMON_DIR}" ) set(HIP_COMMON_INCLUDE_DIR ${HIP_COMMON_DIR}/include) set(HIP_COMMON_BIN_DIR ${HIP_COMMON_DIR}/bin) -set(HIP_HIPCC_EXECUTABLE ${HIP_COMMON_DIR}/bin/hipcc) -set(HIP_HIPCONFIG_EXECUTABLE ${HIP_COMMON_DIR}/bin/hipconfig) +set(__HIPCONFIG_EXECUTABLE__ ${HIP_COMMON_DIR}/bin/hipconfig) ############################# # Setup config generation @@ -71,7 +70,7 @@ endmacro() if(NOT WIN32) # Determine HIP_BASE_VERSION set(ENV{HIP_PATH} "") -execute_process(COMMAND ${HIP_HIPCONFIG_EXECUTABLE} --version +execute_process(COMMAND ${__HIPCONFIG_EXECUTABLE__} --version OUTPUT_VARIABLE HIP_BASE_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE) string(REPLACE "." ";" VERSION_LIST ${HIP_BASE_VERSION}) @@ -193,7 +192,7 @@ endif() # Determine HIP_PLATFORM if(NOT DEFINED HIP_PLATFORM) if(NOT DEFINED ENV{HIP_PLATFORM}) - execute_process(COMMAND ${HIP_HIPCONFIG_EXECUTABLE} --platform + execute_process(COMMAND ${__HIPCONFIG_EXECUTABLE__} --platform OUTPUT_VARIABLE HIP_PLATFORM OUTPUT_STRIP_TRAILING_WHITESPACE) else()