P4 to Git Change 1614278 by wchau@wchau_OCL_cmake on 2018/10/03 21:04:41

SWDEV-165756 - [ROCm] Backport cmake back into perforce to resolve cmake build broken issue
	(Resubmitted CL1613181 with a bug fix)

	- porting CMAKE changes in http://git.amd.com:8080/#/c/173995/
	- add new source file names in runtime/CMakeLists.txt
	-- required additional changes of CMAKE files from Konstantin to build the current OCL driver using CMAKE

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/CMakeLists.txt#17 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/libUtils.cpp#34 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/libUtils.h#34 edit
... //depot/stg/opencl/drivers/opencl/runtime/CMakeLists.txt#13 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/CMakeLists.txt#15 edit
This commit is contained in:
foreman
2018-10-03 21:26:10 -04:00
orang tua 335c31ec76
melakukan 8a8f7e3657
@@ -30,6 +30,12 @@ include_directories(${CMAKE_SOURCE_DIR}/compiler/lib/loaders/elf/utils/libelf)
include_directories(${CMAKE_SOURCE_DIR}/compiler/lib/loaders/elf/utils/common)
include_directories(${CMAKE_SOURCE_DIR}/compiler/tools)
if(UNIX)
set(ADDITIONAL_LIBRARIES glibc_functions.cpp)
else()
set(ADDITIONAL_LIBRARIES "")
endif()
add_library(amdocl64 SHARED
cl_memobj.cpp
cl_program.cpp
@@ -58,6 +64,7 @@ add_library(amdocl64 SHARED
cl_p2p_amd.cpp
$<TARGET_OBJECTS:oclruntime>
$<TARGET_OBJECTS:oclrocm>
${ADDITIONAL_LIBRARIES}
)
target_link_libraries(amdocl64 opencl_driver oclelf pthread dl ${ROCR_LIBRARIES})