Skip to content

Commit c94e347

Browse files
vladimirlazbader
authored andcommitted
[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 <[email protected]>
1 parent b39e552 commit c94e347

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

buildbot/dependency.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,5 +76,8 @@ else
7676
fi
7777

7878
cd ${BUILD_DIR}/OpenCL-ICD-Loader
79+
mkdir build
80+
cd build
81+
cmake ..
7982
make C_INCLUDE_PATH=${OPENCL_HEADERS}
8083
exit_if_err $? "failed to build OpenCL-ICD-Loader"

sycl/CMakeLists.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,16 @@ endif()
6060
if( NOT OpenCL_LIBRARIES )
6161
message("OpenCL_LIBRARIES is missed. Try to build from GitHub sources.")
6262
set(OpenCL_LIBRARIES "${LLVM_LIBRARY_OUTPUT_INTDIR}/libOpenCL.so")
63+
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/icd_build)
6364
ExternalProject_Add(ocl-icd
6465
GIT_REPOSITORY https://github.com/KhronosGroup/OpenCL-ICD-Loader.git
6566
GIT_TAG origin/master
6667
SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/OpenCL/icd"
67-
CONFIGURE_COMMAND ""
68-
BUILD_IN_SOURCE TRUE
68+
BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/icd_build"
69+
CONFIGURE_COMMAND ${CMAKE_COMMAND} "${CMAKE_CURRENT_BINARY_DIR}/OpenCL/icd" -DCMAKE_INSTALL_PREFIX=${LLVM_BINARY_DIR}
6970
BUILD_COMMAND make C_INCLUDE_PATH=${CMAKE_CURRENT_BINARY_DIR}/OpenCL/inc
70-
INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_BINARY_DIR}/OpenCL/icd/build ${LLVM_LIBRARY_OUTPUT_INTDIR}
71-
STEP_TARGETS build,install
71+
INSTALL_COMMAND make install
72+
STEP_TARGETS configure,build,install
7273
DEPENDS ocl-headers
7374
)
7475
else()

0 commit comments

Comments
 (0)