Blit Object target and file should have different names

This is to avoid circular dependencies when using Ninja as a generator.

Change-Id: I703f225c9f342dfb07c36ad0920927c40c922fb8

runtime/hsa-runtime/CMakeLists.txt

@@ -263,7 +263,7 @@ if(${IMAGE_SUPPORT})
   
   ## Depend on blit kernel target.
   add_subdirectory( ${CMAKE_CURRENT_SOURCE_DIR}/image/blit_src )
-  add_dependencies( ${CORE_RUNTIME_TARGET} opencl_blit_objects.cpp )
+  add_dependencies( ${CORE_RUNTIME_TARGET} opencl_blit_objects )
 
 endif()
 

runtime/hsa-runtime/image/blit_src/CMakeLists.txt

@@ -169,14 +169,14 @@ function(generate_blit_file BFILE)
 
   ## Add a custom command that generates opencl_blit_objects.cpp
   ## This depends on all the generated code object files and the C++ generator script.
-  add_custom_command(OUTPUT ${BFILE}
-                     COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/create_hsaco_ascii_file.sh ${CMAKE_CURRENT_BINARY_DIR}/${BFILE}
+  add_custom_command(OUTPUT ${BFILE}.cpp
+                     COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/create_hsaco_ascii_file.sh ${CMAKE_CURRENT_BINARY_DIR}/${BFILE}.cpp
                      DEPENDS ${HSACO_TARG_LIST} create_hsaco_ascii_file.sh )
 
   ## Export a target that builds (and depends on) opencl_blit_objects.cpp
-  add_custom_target( ${BFILE} DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${BFILE} )
+  add_custom_target( ${BFILE} DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${BFILE}.cpp )
 
 endfunction(generate_blit_file)
 
 build_kernel_for_devices("ocl_blit_object")
-generate_blit_file("opencl_blit_objects.cpp")
+generate_blit_file("opencl_blit_objects")