Modify runtime cmake files to use HSA_CLOSED_SOURCE_ROOT.

Change-Id: I416f8608cfb793eac9065c1f63a85da2d3c3a816
This commit is contained in:
James Edwards
2016-05-31 14:08:10 -05:00
parent 5a14d496ab
commit f49ddad0a1
3 changed files with 8 additions and 8 deletions
+5 -5
View File
@@ -65,7 +65,7 @@ project ( ${IMAGE_TARGET} )
## External dependencies and directories
if ( NOT DEFINED REG_INCLUDE )
set(REG_INCLUDE ${AMD_CLOSED_SOURCE_DIR}/inc/asic_reg)
set(REG_INCLUDE ${HSA_CLOSED_SOURCE_DIR}/drivers/inc/asic_reg)
endif()
if ( NOT EXISTS ${REG_INCLUDE}/si_id.h )
@@ -117,10 +117,10 @@ include_directories ( ${EXT_SOURCE_DIR}/image/addrlib/inc/chip )
include_directories ( ${EXT_SOURCE_DIR}/image/addrlib/inc/chip/r800 )
include_directories ( ${EXT_SOURCE_DIR}/image/addrlib/r800 )
include_directories ( ${EXT_SOURCE_DIR}/image/addrlib/r800/chip )
include_directories ( ${AMD_CLOSED_SOURCE_DIR}/hsa/compiler/ext_finalize/amdhsafin/Interface )
include_directories ( ${AMD_CLOSED_SOURCE_DIR}/hsa/compiler/finalizer/HSAIL/hsail-tools/libHSAIL-AMD )
include_directories ( ${AMD_CLOSED_SOURCE_DIR}/hsa/compiler/finalizer/HSAIL/hsail-tools/libHSAIL )
include_directories ( ${AMD_CLOSED_SOURCE_DIR}/hsa/compiler/finalizer/HSAIL/hsail-tools/libHSAIL/build/${LIBHSAIL_BUILD_FOLDER} )
include_directories ( ${HSA_CLOSED_SOURCE_DIR}/drivers/hsa/compiler/ext_finalize/amdhsafin/Interface )
include_directories ( ${HSA_CLOSED_SOURCE_DIR}/drivers/hsa/compiler/finalizer/HSAIL/hsail-tools/libHSAIL-AMD )
include_directories ( ${HSA_CLOSED_SOURCE_DIR}/drivers/hsa/compiler/finalizer/HSAIL/hsail-tools/libHSAIL )
include_directories ( ${HSA_CLOSED_SOURCE_DIR}/drivers/hsa/compiler/finalizer/HSAIL/hsail-tools/libHSAIL/build/${LIBHSAIL_BUILD_FOLDER} )
set ( IMAGE_SRCS ${EXT_SOURCE_DIR}/image/addrlib/addrinterface.cpp
${EXT_SOURCE_DIR}/image/addrlib/core/addrelemlib.cpp
+2 -2
View File
@@ -47,7 +47,7 @@ project ( ${TOOLS_TARGET} )
## External dependencies
if ( NOT DEFINED REG_INCLUDE )
set(REG_INCLUDE ${AMD_CLOSED_SOURCE_DIR}/inc/asic_reg)
set(REG_INCLUDE ${HSA_CLOSED_SOURCE_DIR}/drivers/inc/asic_reg)
endif()
if ( NOT EXISTS ${REG_INCLUDE}/si_id.h )
@@ -55,7 +55,7 @@ if ( NOT EXISTS ${REG_INCLUDE}/si_id.h )
endif ()
if ( NOT DEFINED HSAKMT_INCLUDE )
set(HSAKMT_INCLUDE ${AMD_CLOSED_SOURCE_DIR}/hsathk/include)
set(HSAKMT_INCLUDE ${HSA_CLOSED_SOURCE_DIR}/drivers/hsathk/include)
endif()
if ( NOT EXISTS ${HSAKMT_INCLUDE}/hsakmt.h )
+1 -1
View File
@@ -91,7 +91,7 @@ set ( RUNTIME_TOOLS_HEADER_NAMES
"amd_hsa_tools_interfaces.h"
)
set ( RUNTIME_TOOLS_INCLUDE_DIR "${AMD_CLOSED_SOURCE_ROOT}/drivers/hsa/runtime/tools/inc" )
set ( RUNTIME_TOOLS_INCLUDE_DIR "${HSA_CLOSED_SOURCE_ROOT}/drivers/hsa/runtime/tools/inc" )
set ( HSA_INCLUDE_LINK "${EXTERNAL_DIR}/hsa/include/hsa" )