P4 to Git Change 1971654 by kzhuravl@kzhuravl-spot-ocl on 2019/07/22 17:15:57
SWDEV-79445 - Bring cmake related changes from git http://git.amd.com:8080/c/compute/ec/opencl/+/229473 http://git.amd.com:8080/c/compute/ec/opencl/+/229474 http://git.amd.com:8080/c/compute/ec/opencl/+/233268 + Payam's changes for comgr Affected files ... ... //depot/stg/opencl/drivers/opencl/CMakeLists.txt#24 edit ... //depot/stg/opencl/drivers/opencl/DEB/postinst#1 add ... //depot/stg/opencl/drivers/opencl/DEB/prerm#1 add ... //depot/stg/opencl/drivers/opencl/RPM/rpm_post#1 add ... //depot/stg/opencl/drivers/opencl/RPM/rpm_postun#1 add ... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/CMakeLists.txt#18 edit ... //depot/stg/opencl/drivers/opencl/cmake/modules/FindROCR.cmake#3 edit ... //depot/stg/opencl/drivers/opencl/cmake/modules/FindROCT.cmake#1 add ... //depot/stg/opencl/drivers/opencl/runtime/CMakeLists.txt#15 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/CMakeLists.txt#20 edit
这个提交包含在:
@@ -7,6 +7,12 @@ include_directories(${CMAKE_SOURCE_DIR}/compiler/lib/loaders/elf/utils/libelf)
|
||||
include_directories(${CMAKE_CURRENT_BINARY_DIR})
|
||||
include_directories(${ROCM_OCL_INCLUDES})
|
||||
|
||||
if(${USE_COMGR_LIBRARY} MATCHES "yes")
|
||||
add_definitions(-DUSE_COMGR_LIBRARY -DCOMGR_DYN_DLL)
|
||||
find_package(amd_comgr REQUIRED CONFIG)
|
||||
include_directories("$<TARGET_PROPERTY:amd_comgr,INTERFACE_INCLUDE_DIRECTORIES>")
|
||||
endif()
|
||||
|
||||
add_library(oclrocm OBJECT
|
||||
roccounters.cpp
|
||||
rocprintf.cpp
|
||||
|
||||
在新工单中引用
屏蔽一个用户