From 5f25d024a8dcb7698d1013e63d901ab12cd20fb4 Mon Sep 17 00:00:00 2001 From: Felix Kuehling Date: Fri, 1 Jun 2018 17:06:00 -0400 Subject: [PATCH] Prepare for hsakmt build system cleanup These fixes are needed to find the hsakmt headers and libraries with an upcoming hsakmt build system cleanup. It should continue to work with the original hsakmt build system. Change-Id: I6b3fcea8f2588698c130c9ec50952c66712afa6c Signed-off-by: Felix Kuehling --- runtime/hsa-ext-finalize/CMakeLists.txt | 6 +++--- runtime/hsa-ext-image/CMakeLists.txt | 2 +- runtime/hsa-runtime-tools/CMakeLists.txt | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/runtime/hsa-ext-finalize/CMakeLists.txt b/runtime/hsa-ext-finalize/CMakeLists.txt index abe5da593b..700ad04346 100755 --- a/runtime/hsa-ext-finalize/CMakeLists.txt +++ b/runtime/hsa-ext-finalize/CMakeLists.txt @@ -47,12 +47,12 @@ endif () set ( BUILD_VERSION_STRING "${BUILD_VERSION_MAJOR}.${BUILD_VERSION_MINOR}.${BUILD_VERSION_PATCH}" ) ## Find the hsakmt library and include files -find_file ( HSAKMT_INC "libhsakmt/hsakmt.h" ) +find_file ( HSAKMT_INC NAMES "hsakmt.h" "libhsakmt/hsakmt.h" ) find_library ( HSAKMT_LIB libhsakmt.so ) get_filename_component ( HSAKMT_LIB_PATH ${HSAKMT_LIB} DIRECTORY ) get_filename_component ( HSAKMT_INC_PATH ${HSAKMT_INC} DIRECTORY ) -include_directories ( ${HSAKMT_BUILD_INC_PATH} ) -link_directories (${HSAKMT_BUILD_LIB_PATH}) +include_directories ( ${HSAKMT_INC_PATH} ) +link_directories (${HSAKMT_LIB_PATH}) ## Find the hsa-runtime and include files find_file ( HSA_INC "hsa/hsa.h" ) diff --git a/runtime/hsa-ext-image/CMakeLists.txt b/runtime/hsa-ext-image/CMakeLists.txt index fc6e37ff1e..782d6d2b93 100755 --- a/runtime/hsa-ext-image/CMakeLists.txt +++ b/runtime/hsa-ext-image/CMakeLists.txt @@ -43,7 +43,7 @@ endif () set ( BUILD_VERSION_STRING "${BUILD_VERSION_MAJOR}.${BUILD_VERSION_MINOR}.${BUILD_VERSION_PATCH}" ) ## Find the hsakmt library and include files -find_file ( HSAKMT_INC "libhsakmt/hsakmt.h" ) +find_file ( HSAKMT_INC NAMES "hsakmt.h" "libhsakmt/hsakmt.h" ) find_library ( HSAKMT_LIB libhsakmt.so ) get_filename_component ( HSAKMT_LIB_PATH ${HSAKMT_LIB} DIRECTORY ) get_filename_component ( HSAKMT_INC_PATH ${HSAKMT_INC} DIRECTORY ) diff --git a/runtime/hsa-runtime-tools/CMakeLists.txt b/runtime/hsa-runtime-tools/CMakeLists.txt index 1d40d6eb48..2860c18a3f 100755 --- a/runtime/hsa-runtime-tools/CMakeLists.txt +++ b/runtime/hsa-runtime-tools/CMakeLists.txt @@ -35,12 +35,12 @@ endif () set ( BUILD_VERSION_STRING "${BUILD_VERSION_MAJOR}.${BUILD_VERSION_MINOR}.${BUILD_VERSION_PATCH}" ) ## Find the hsakmt library and include files -find_file ( HSAKMT_INC "libhsakmt/hsakmt.h" ) +find_file ( HSAKMT_INC NAMES "hsakmt.h" "libhsakmt/hsakmt.h" ) find_library ( HSAKMT_LIB libhsakmt.so ) get_filename_component ( HSAKMT_LIB_PATH ${HSAKMT_LIB} DIRECTORY ) get_filename_component ( HSAKMT_INC_PATH ${HSAKMT_INC} DIRECTORY ) -include_directories ( ${HSAKMT_BUILD_INC_PATH} ) -link_directories (${HSAKMT_BUILD_LIB_PATH}) +include_directories ( ${HSAKMT_INC_PATH} ) +link_directories (${HSAKMT_LIB_PATH}) ## Find the hsa-runtime and include files find_file ( HSA_INC "hsa/hsa.h" )