Merge pull request #249 from intel-kzhavoro/ocl-open-120

Fix one-call cross-build

Author: fzou1

CMakeLists.txt

@@ -144,8 +144,7 @@ endif(NOT USE_PREBUILT_LLVM)
 #
 set (COMPILE_OPTIONS_TD  opencl_clang_options.td)
 set (COMPILE_OPTIONS_INC opencl_clang_options.inc)
-
-set(LLVM_TABLEGEN_EXE "llvm-tblgen")
+find_program(LLVM_TABLEGEN_EXE "llvm-tblgen" ${LLVM_TOOLS_BINARY_DIR})
 set(LLVM_TARGET_DEFINITIONS ${COMPILE_OPTIONS_TD})
 if(USE_PREBUILT_LLVM)
   set(TABLEGEN_ADDITIONAL -I ${LLVM_INCLUDE_DIRS})

cl_headers/CMakeLists.txt

@@ -1,6 +1,5 @@
 set(CL_HEADERS_LIB cl_headers)
 set(CLANG_COMMAND clang)
-set(LINUX_RESOURCE_LINKER_COMMAND linux_resource_linker)
 
 function(copy_file SRC DST)
 add_custom_command(
@@ -31,7 +30,7 @@ add_custom_target (
 function(pack_to_obj SRC DST TAG)
     add_custom_command (
         OUTPUT ${DST}
-        DEPENDS ${SRC} ${LINUX_RESOURCE_LINKER_COMMAND}
+        DEPENDS ${SRC} linux_resource_linker
         COMMAND ${LINUX_RESOURCE_LINKER_COMMAND} "${SRC}" "${DST}" "${TAG}"
         COMMENT "Packing ${SRC}"
     )

linux_linker/CMakeLists.txt

@@ -1 +1,11 @@
-ADD_EXECUTABLE(linux_resource_linker linux_resource_linker)
+add_executable(linux_resource_linker linux_resource_linker.cpp)
+
+if(LLVM_USE_HOST_TOOLS)
+  build_native_tool(linux_resource_linker LINUX_RESOURCE_LINKER_COMMAND)
+  add_custom_target(linux_resource_linker-host DEPENDS ${LINUX_RESOURCE_LINKER_COMMAND} )
+  add_dependencies(linux_resource_linker linux_resource_linker-host)
+else()
+  set(LINUX_RESOURCE_LINKER_COMMAND linux_resource_linker)
+endif()
+
+set(LINUX_RESOURCE_LINKER_COMMAND ${LINUX_RESOURCE_LINKER_COMMAND} PARENT_SCOPE)