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 <Felix.Kuehling@amd.com>

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" )

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 )

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" )