@@ -21,6 +21,26 @@ function(add_sycl_rt_library LIB_NAME LIB_OBJ_NAME)
21
21
cmake_parse_arguments (ARG "" "XPTI_LIB;IMPLIB_NAME" "COMPILE_OPTIONS;SOURCES" ${ARGN} )
22
22
23
23
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
+
24
44
add_library (${LIB_NAME} SHARED
25
45
$< TARGET_OBJECTS:${LIB_OBJ_NAME} >
26
46
${CMAKE_CURRENT_BINARY_DIR} /version.rc )
@@ -87,8 +107,6 @@ function(add_sycl_rt_library LIB_NAME LIB_OBJ_NAME)
87
107
target_include_directories (${LIB_OBJ_NAME} PRIVATE ${zstd_INCLUDE_DIR} )
88
108
endif ()
89
109
90
- target_include_directories (${LIB_OBJ_NAME} PRIVATE ${BOOST_UNORDERED_INCLUDE_DIRS} )
91
-
92
110
# ur_win_proxy_loader
93
111
if (WIN32 )
94
112
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)
147
165
148
166
target_compile_definitions (${LIB_OBJ_NAME} PRIVATE SYCL2020_DISABLE_DEPRECATION_WARNINGS )
149
167
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
-
161
168
if (SYCL_ENABLE_EXTENSION_JIT )
162
169
if (NOT DEFINED LLVM_EXTERNAL_SYCL_JIT_SOURCE_DIR )
163
170
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)
182
189
${CMAKE_THREAD_LIBS_INIT}
183
190
)
184
191
185
- # Link and include UR
186
- target_link_libraries (${LIB_OBJ_NAME}
187
- PRIVATE
188
- UnifiedRuntime-Headers
189
- UnifiedRuntimeCommon
190
- )
191
-
192
+ # Link UR
192
193
target_link_libraries (${LIB_NAME}
193
194
PRIVATE
194
195
UnifiedRuntime-Headers
0 commit comments