From f8472a055c3818fc6b5efc9a1fb0a5c6182e9add Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Mon, 30 Jul 2018 16:08:33 -0400 Subject: [PATCH] kfdtest: Use libhsakmt to replace all the occurrences of thunk Thunk is an internal name and we'd better reference it using the library name. Change-Id: I20042bda546e5249530311d3de30c71d99379033 Signed-off-by: Yong Zhao --- tests/kfdtest/CMakeLists.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/kfdtest/CMakeLists.txt b/tests/kfdtest/CMakeLists.txt index fe7fed8132..5afc3f3619 100644 --- a/tests/kfdtest/CMakeLists.txt +++ b/tests/kfdtest/CMakeLists.txt @@ -21,7 +21,7 @@ # # -# If environment variable DRM_DIR or THUNK_LIB_OUT is set, the script +# If environment variable DRM_DIR or LIBHSAKMT_PATH is set, the script # will pick up the corresponding libraries from those pathes. cmake_minimum_required(VERSION 2.8 FATAL_ERROR) @@ -48,24 +48,24 @@ else() endif() -if( DEFINED ENV{THUNK_LIB_OUT} ) - set ( THUNK_LIB_OUT $ENV{THUNK_LIB_OUT} ) - message ( " THUNK_LIB_OUT environment variable is set" ) +if( DEFINED ENV{LIBHSAKMT_PATH} ) + set ( LIBHSAKMT_PATH $ENV{LIBHSAKMT_PATH} ) + message ( "LIBHSAKMT_PATH environment variable is set" ) else() set ( ENV{PKG_CONFIG_PATH} /opt/rocm/libhsakmt/ ) pkg_check_modules(HSAKMT libhsakmt) if( NOT HSAKMT_FOUND ) - set ( THUNK_LIB_OUT $ENV{OUT_DIR} ) + set ( LIBHSAKMT_PATH $ENV{OUT_DIR} ) endif() endif() -if( DEFINED THUNK_LIB_OUT ) - set ( HSAKMT_INCLUDE_DIRS ${THUNK_LIB_OUT}/include ) - set ( HSAKMT_LIBRARY_DIRS ${THUNK_LIB_OUT}/lib ) +if( DEFINED LIBHSAKMT_PATH ) + set ( HSAKMT_INCLUDE_DIRS ${LIBHSAKMT_PATH}/include ) + set ( HSAKMT_LIBRARY_DIRS ${LIBHSAKMT_PATH}/lib ) set ( HSAKMT_LIBRARIES hsakmt ) endif() -message ( "Find thunk lib at ${HSAKMT_LIBRARY_DIRS}" ) +message ( "Find libhsakmt at ${HSAKMT_LIBRARY_DIRS}" ) set ( SP3_DIR ${PROJECT_SOURCE_DIR}/sp3 )