AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve build system handling of non-default directory layouts.

Browse Source 
Adds the thunk include and lib paths to the cache, removes paths
to indicator files from the cache, uses the cached path directory
(if any) as a search hint for indicator files.

Change-Id: I0859faa8d229a97abfaacb408d2c831e317aed5f


[ROCm/ROCR-Runtime commit: a8d818a6bc]
This commit is contained in:
Sean Keely
2017-10-18 15:09:10 -05:00
parent 41615ea7d5
commit 5dfef3ef77
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/rocr-runtime/runtime/hsa-runtime/CMakeLists.txt
+7 -5
View File
@@ -77,11 +77,13 @@ if ( DEFINED VERSION_BUILD )
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_library ( HSAKMT_LIB libhsakmt.so )
get_filename_component ( HSAKMT_LIB_PATH ${HSAKMT_LIB} DIRECTORY )
get_filename_component ( HSAKMT_INC_PATH ${HSAKMT_INC} DIRECTORY )
## Find the hsakmt library and include files, use directory hint from cache
find_file ( HSAKMT_INC NAMES "hsakmt.h" "libhsakmt/hsakmt.h" PATHS ${HSAKMT_INC_PATH} )
find_library ( HSAKMT_LIB "libhsakmt.so" ${HSAKMT_LIB_PATH} )
get_filename_component ( HSAKMT_INC_PATH ${HSAKMT_INC} DIRECTORY CACHE )
get_filename_component ( HSAKMT_LIB_PATH ${HSAKMT_LIB} DIRECTORY CACHE )
unset( HSAKMT_INC CACHE )
unset( HSAKMT_LIB CACHE )
## Set include and link directories for libhsakmt
include_directories ( ${HSAKMT_INC_PATH} )