Skip to content

Commit acaa59c

Browse files
[SYCL][NFC] SYCL RT CMakeLists cleanup [3/N] (#17413)
Consolidated all common (i.e. non-conditional) include directories settings for SYCL RT build in a single place.
1 parent 93e147e commit acaa59c

File tree

1 file changed

+21
-20
lines changed

1 file changed

+21
-20
lines changed

sycl/source/CMakeLists.txt

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,26 @@ function(add_sycl_rt_library LIB_NAME LIB_OBJ_NAME)
2121
cmake_parse_arguments(ARG "" "XPTI_LIB;IMPLIB_NAME" "COMPILE_OPTIONS;SOURCES" ${ARGN})
2222

2323
add_library(${LIB_OBJ_NAME} OBJECT ${ARG_SOURCES})
24+
25+
# Common compilation step setup
26+
27+
target_include_directories(
28+
${LIB_OBJ_NAME}
29+
PRIVATE
30+
${CMAKE_CURRENT_SOURCE_DIR}
31+
${sycl_inc_dir}
32+
${BOOST_UNORDERED_INCLUDE_DIRS}
33+
)
34+
35+
# Object libraries are not linked, so these "libraries" are in fact include
36+
# directories
37+
target_link_libraries(${LIB_OBJ_NAME}
38+
PRIVATE
39+
UnifiedRuntime-Headers
40+
# TODO: Remove dependency on opencl headers.
41+
OpenCL-Headers
42+
)
43+
2444
add_library(${LIB_NAME} SHARED
2545
$<TARGET_OBJECTS:${LIB_OBJ_NAME}>
2646
${CMAKE_CURRENT_BINARY_DIR}/version.rc)
@@ -87,8 +107,6 @@ function(add_sycl_rt_library LIB_NAME LIB_OBJ_NAME)
87107
target_include_directories(${LIB_OBJ_NAME} PRIVATE ${zstd_INCLUDE_DIR})
88108
endif()
89109

90-
target_include_directories(${LIB_OBJ_NAME} PRIVATE ${BOOST_UNORDERED_INCLUDE_DIRS})
91-
92110
# ur_win_proxy_loader
93111
if (WIN32)
94112
include_directories(${LLVM_EXTERNAL_SYCL_SOURCE_DIR}/ur_win_proxy_loader)
@@ -147,17 +165,6 @@ function(add_sycl_rt_library LIB_NAME LIB_OBJ_NAME)
147165

148166
target_compile_definitions(${LIB_OBJ_NAME} PRIVATE SYCL2020_DISABLE_DEPRECATION_WARNINGS)
149167

150-
target_include_directories(
151-
${LIB_OBJ_NAME}
152-
PRIVATE
153-
${CMAKE_CURRENT_SOURCE_DIR}
154-
"${sycl_inc_dir}"
155-
)
156-
#TODO: Remove dependency on opencl headers.
157-
target_link_libraries(${LIB_OBJ_NAME}
158-
PRIVATE OpenCL-Headers
159-
)
160-
161168
if(SYCL_ENABLE_EXTENSION_JIT)
162169
if(NOT DEFINED LLVM_EXTERNAL_SYCL_JIT_SOURCE_DIR)
163170
message(FATAL_ERROR "Undefined LLVM_EXTERNAL_SYCL_JIT_SOURCE_DIR variable: Must be set when extension to JIT SYCL kernels is enabled")
@@ -182,13 +189,7 @@ function(add_sycl_rt_library LIB_NAME LIB_OBJ_NAME)
182189
${CMAKE_THREAD_LIBS_INIT}
183190
)
184191

185-
# Link and include UR
186-
target_link_libraries(${LIB_OBJ_NAME}
187-
PRIVATE
188-
UnifiedRuntime-Headers
189-
UnifiedRuntimeCommon
190-
)
191-
192+
# Link UR
192193
target_link_libraries(${LIB_NAME}
193194
PRIVATE
194195
UnifiedRuntime-Headers

0 commit comments

Comments
 (0)