From 2e9e7996e8400a892da3b5c4d536c76ca0fe2903 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Sun, 26 Apr 2020 18:21:01 -0400 Subject: [PATCH] kfdtest: Fix a path error in CMakeLists.txt PKG_CONFIG_PATH environment variable should be set to /lib/pkgconfig, because the *.pc file is located there. Signed-off-by: Yong Zhao Change-Id: Iec503b1c2409987e52fd88fea160c70762686a28 [ROCm/ROCR-Runtime commit: 33c34506fa3a94c253502028a23c8f78dc318c66] --- projects/rocr-runtime/tests/kfdtest/CMakeLists.txt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/projects/rocr-runtime/tests/kfdtest/CMakeLists.txt b/projects/rocr-runtime/tests/kfdtest/CMakeLists.txt index 06eb821b17..63627ef04b 100644 --- a/projects/rocr-runtime/tests/kfdtest/CMakeLists.txt +++ b/projects/rocr-runtime/tests/kfdtest/CMakeLists.txt @@ -72,15 +72,14 @@ if( DEFINED ENV{LIBHSAKMT_PATH} ) message ( "LIBHSAKMT_PATH environment variable is set" ) else() if ( ${ROCM_INSTALL_PATH} ) - set ( ENV{PKG_CONFIG_PATH} ${ROCM_INSTALL_PATH} ) - pkg_check_modules(HSAKMT libhsakmt) + set ( ENV{PKG_CONFIG_PATH} ${ROCM_INSTALL_PATH}/share/pkgconfig ) else() - set ( ENV{PKG_CONFIG_PATH} /opt/rocm/libhsakmt/ ) - pkg_check_modules(HSAKMT libhsakmt) + set ( ENV{PKG_CONFIG_PATH} /opt/rocm/share/pkgconfig ) endif() + + pkg_check_modules(HSAKMT libhsakmt) + if( NOT HSAKMT_FOUND ) - set ( ENV{PKG_CONFIG_PATH} /opt/rocm/libhsakmt/ ) - pkg_check_modules(HSAKMT libhsakmt) set ( LIBHSAKMT_PATH $ENV{OUT_DIR} ) endif() endif()