[SYCL] Propagate C and C++ compilers to ICD build

When there's more than 1 compiler (e.g MinGW and MSVC on Windows), and
non-default compiler is used to build SYCL, OpenCL ICD loader will still
be built with the default one. This patch propagates LLVM's compiler to
ICD CMake generator.

Signed-off-by: Alexander Batashev <[email protected]>

Author: Alexander Batashev

sycl/CMakeLists.txt

@@ -84,11 +84,16 @@ if( NOT OpenCL_LIBRARIES )
   if(MSVC)
     set(OpenCL_LIBRARIES
         "${LLVM_LIBRARY_OUTPUT_INTDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}OpenCL${CMAKE_STATIC_LIBRARY_SUFFIX}")
-    set(OPENCL_ICD_LOADER_WDK "-DOPENCL_ICD_LOADER_REQUIRE_WDK=OFF")
+    set(AUX_CMAKE_FLAGS "${AUX_CMAKE_FLAGS} -DOPENCL_ICD_LOADER_REQUIRE_WDK=OFF")
   else()
     set(OpenCL_LIBRARIES
         "${LLVM_LIBRARY_OUTPUT_INTDIR}/${CMAKE_SHARED_LIBRARY_PREFIX}OpenCL${CMAKE_SHARED_LIBRARY_SUFFIX}")
-    set(OPENCL_ICD_LOADER_WDK "")
+  endif()
+  if (CMAKE_C_COMPILER)
+      set(AUX_CMAKE_FLAGS "${AUX_CMAKE_FLAGS} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}")
+  endif()
+  if (CMAKE_CXX_COMPILER)
+      set(AUX_CMAKE_FLAGS "${AUX_CMAKE_FLAGS} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}")
   endif()
   file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/icd_build)
   ExternalProject_Add(ocl-icd
@@ -101,7 +106,7 @@ if( NOT OpenCL_LIBRARIES )
                -DOPENCL_ICD_LOADER_HEADERS_DIR=${CMAKE_CURRENT_BINARY_DIR}/OpenCL/inc
                -DCMAKE_INSTALL_PREFIX=${LLVM_BINARY_DIR}
                -DCMAKE_INSTALL_LIBDIR:PATH=lib
-               ${OPENCL_ICD_LOADER_WDK}
+               ${AUX_CMAKE_FLAGS}
     STEP_TARGETS      configure,build,install
     DEPENDS           ocl-headers
     BUILD_BYPRODUCTS ${OpenCL_LIBRARIES}