P4 to Git Change 1618184 by kzhuravl@kzhuravl-fiji-ocllc-2 on 2018/10/12 14:28:12

SWDEV-125823 - Fix cmake-based opencl build from p4

	//depot/mirrors/amdgcn.git/* changes would be submitted through gerrit.

Affected files ...

... //depot/stg/opencl/drivers/opencl/CMakeLists.txt#21 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/libUtils.cpp#35 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/libUtils.h#35 edit
... //depot/stg/opencl/drivers/opencl/runtime/CMakeLists.txt#14 edit


[ROCm/clr commit: 2dcc063b81]
This commit is contained in:
foreman
2018-10-18 03:07:56 -04:00
parent f63171477c
commit 340a38bc2c
4 changed files with 14 additions and 1 deletions
@@ -21,6 +21,7 @@ include_directories(${CMAKE_SOURCE_DIR}/compiler/lib/include)
include_directories(${CMAKE_SOURCE_DIR}/compiler/lib/backends/common)
include_directories(${CMAKE_SOURCE_DIR}/compiler/lib/loaders)
include_directories(${CMAKE_SOURCE_DIR}/compiler/tools)
include_directories(${CMAKE_BINARY_DIR}/runtime/device/rocm)
add_definitions(-DBSD_LIBELF)
include_directories(${CMAKE_SOURCE_DIR}/compiler/lib/loaders/elf/utils/common)
@@ -63,3 +64,11 @@ add_library(oclruntime OBJECT
)
set_target_properties(oclruntime PROPERTIES POSITION_INDEPENDENT_CODE ON)
set(AMDGCN_DEP_LIST)
if(AMDGCN_TARGETS_LIB_DEPS)
set(${AMDGCN_TARGETS_LIB_DEPS} ${AMDGCN_DEP_LIST} PARENT_SCOPE)
endif()
foreach(AMDGCN_DEP_TARGET ${AMDGCN_DEP_TARGETS})
add_dependencies(oclruntime ${AMDGCN_DEP_TARGET})
endforeach()