P4 to Git Change 1423425 by lmoriche@lmoriche_palamida on 2017/06/16 13:49:36

SWDEV-102733 - [OCL-LC-ROCm] Cmake build Write CMakeLists.txt to enable building with and without the DK environment
	- Update from git.

Affected files ...

... //depot/stg/opencl/drivers/opencl/CMakeLists.txt#12 edit
... //depot/stg/opencl/drivers/opencl/cmake/modules/bc2h.cmake#1 add
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/CMakeLists.txt#7 edit

rocclr/runtime/device/rocm/CMakeLists.txt

@@ -1,8 +1,11 @@
+include(bc2h)
+
 set(INC_SUFFIX "amdgcn.inc")
 
 include_directories(${CMAKE_SOURCE_DIR}/compiler/lib/loaders/elf/utils/common)
 include_directories(${CMAKE_SOURCE_DIR}/compiler/lib/loaders/elf/utils/libelf)
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${ROCM_OCL_INCLUDES})
 
 add_library(oclrocm OBJECT
   rocprintf.cpp
@@ -30,7 +33,7 @@ foreach(AMDGCN_LIB_TARGET ${AMDGCN_LIB_TARGETS})
   set(symbol "${lib_file_name}_amdgcn")
   add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${header}
     COMMAND bc2h ${bclib} ${CMAKE_CURRENT_BINARY_DIR}/${header} ${symbol}
-    DEPENDS ${AMDGCN_LIB_TARGET}
+    DEPENDS bc2h ${AMDGCN_LIB_TARGET}
     COMMENT "Generating ${header}"
   )
   set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_CURRENT_BINARY_DIR}/${target}.inc)
@@ -90,4 +93,4 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/opencl2.0-c.amdgcn.inc
 )
 set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_CURRENT_BINARY_DIR}/opencl2.0-c.amdgcn.inc ${CMAKE_CURRENT_BINARY_DIR}/opencl2.0-c.amdgcn.pch)
 add_custom_target(opencl2.0-c.amdgcn.inc ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/opencl2.0-c.amdgcn.inc)
-add_dependencies(oclrocm opencl2.0-c.amdgcn.inc)
+add_dependencies(oclrocm opencl2.0-c.amdgcn.inc)