From 4eaa9fa01a6475b26e9499d083bc64db8b938cef Mon Sep 17 00:00:00 2001 From: Ajay Date: Thu, 6 Apr 2023 15:41:10 -0700 Subject: [PATCH] SWDEV-361630 - clr to be able to build hip directed tests Change-Id: I85b45c52573683a963ac2b4ee0ec7c79653ecc4d [ROCm/clr commit: 5e9545fdfd1d8b1c7729dcac7c49a6e653fce1e4] --- projects/clr/hipamd/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/clr/hipamd/CMakeLists.txt b/projects/clr/hipamd/CMakeLists.txt index c2c82aa08a..0aaca21e6f 100755 --- a/projects/clr/hipamd/CMakeLists.txt +++ b/projects/clr/hipamd/CMakeLists.txt @@ -439,7 +439,7 @@ endif() ############################# # HIT is not compatible with Windows if(NOT WIN32) -set(HIP_ROOT_DIR ${CMAKE_CURRENT_BINARY_DIR}) +set(HIP_ROOT_DIR ${CMAKE_INSTALL_PREFIX}) set(HIP_SRC_PATH ${CMAKE_CURRENT_SOURCE_DIR}) if(HIP_PLATFORM STREQUAL "nvidia") execute_process(COMMAND "${CMAKE_COMMAND}" -E copy_directory "${HIP_SRC_PATH}/include" "${HIP_ROOT_DIR}/include" RESULT_VARIABLE RUN_HIT ERROR_QUIET) @@ -449,6 +449,7 @@ execute_process(COMMAND "${CMAKE_COMMAND}" -E copy_directory "${HIP_COMMON_DIR}/ if(${RUN_HIT} EQUAL 0) execute_process(COMMAND "${CMAKE_COMMAND}" -E copy_directory "${HIP_COMMON_BIN_DIR}" "${HIP_ROOT_DIR}/bin" RESULT_VARIABLE RUN_HIT ERROR_QUIET) endif() + if(HIP_CATCH_TEST EQUAL "1") message(STATUS "Building of catch tests through hipamd is no longer supported. Testing targets will not be available. catch tests have been moved to an independent github project hip-tests. Please refer to hip-tests Readme for build instructions! ") else()