From 2fe1566030bbb6d755e1e87897ac65219b02ac62 Mon Sep 17 00:00:00 2001 From: Vladimir Lazarev Date: Wed, 22 May 2019 10:54:20 +0300 Subject: [PATCH] [SYCL] Align with recent changes in ICD loader build All non-CMake build files were removed from the ICD Loader project. SYCL building scripts now run cmake to generate make build scripts. Signed-off-by: Vladimir Lazarev --- buildbot/dependency.sh | 3 +++ sycl/CMakeLists.txt | 9 +++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/buildbot/dependency.sh b/buildbot/dependency.sh index ab7acac51eccb..c66d993ca3af6 100755 --- a/buildbot/dependency.sh +++ b/buildbot/dependency.sh @@ -76,5 +76,8 @@ else fi cd ${BUILD_DIR}/OpenCL-ICD-Loader +mkdir build +cd build +cmake .. make C_INCLUDE_PATH=${OPENCL_HEADERS} exit_if_err $? "failed to build OpenCL-ICD-Loader" diff --git a/sycl/CMakeLists.txt b/sycl/CMakeLists.txt index 40314c6f5fc9a..ea6887c0ba6b0 100644 --- a/sycl/CMakeLists.txt +++ b/sycl/CMakeLists.txt @@ -60,15 +60,16 @@ endif() if( NOT OpenCL_LIBRARIES ) message("OpenCL_LIBRARIES is missed. Try to build from GitHub sources.") set(OpenCL_LIBRARIES "${LLVM_LIBRARY_OUTPUT_INTDIR}/libOpenCL.so") + file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/icd_build) ExternalProject_Add(ocl-icd GIT_REPOSITORY https://github.com/KhronosGroup/OpenCL-ICD-Loader.git GIT_TAG origin/master SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/OpenCL/icd" - CONFIGURE_COMMAND "" - BUILD_IN_SOURCE TRUE + BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/icd_build" + CONFIGURE_COMMAND ${CMAKE_COMMAND} "${CMAKE_CURRENT_BINARY_DIR}/OpenCL/icd" -DCMAKE_INSTALL_PREFIX=${LLVM_BINARY_DIR} BUILD_COMMAND make C_INCLUDE_PATH=${CMAKE_CURRENT_BINARY_DIR}/OpenCL/inc - INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_BINARY_DIR}/OpenCL/icd/build ${LLVM_LIBRARY_OUTPUT_INTDIR} - STEP_TARGETS build,install + INSTALL_COMMAND make install + STEP_TARGETS configure,build,install DEPENDS ocl-headers ) else()