Skip to content

Commit d2bd8bc

Browse files
[SYCL][NFC] SYCL RT CMakeLists cleanup [5/N] (#17419)
Consolidated all common (i.e. non-conditional) linked libraries settings for SYCL RT build in a single place.
1 parent a20c57d commit d2bd8bc

File tree

1 file changed

+14
-23
lines changed

1 file changed

+14
-23
lines changed

sycl/source/CMakeLists.txt

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,24 @@ function(add_sycl_rt_library LIB_NAME LIB_OBJ_NAME)
4949
OpenCL-Headers
5050
)
5151

52+
# Common link step setup
53+
5254
add_library(${LIB_NAME} SHARED
5355
$<TARGET_OBJECTS:${LIB_OBJ_NAME}>
5456
${CMAKE_CURRENT_BINARY_DIR}/version.rc)
5557

58+
find_package(Threads REQUIRED)
59+
60+
target_link_libraries(${LIB_NAME}
61+
PRIVATE
62+
${CMAKE_DL_LIBS}
63+
${CMAKE_THREAD_LIBS_INIT}
64+
$<$<NOT:$<BOOL:${WIN32}>>:UnifiedRuntimeLoader>
65+
$<$<BOOL:${WIN32}>:shlwapi>
66+
)
67+
68+
# Feature-specific compilation and link step setup
69+
5670
# Unlike for sycl library, for LLVMSupport we have only one version for a given build,
5771
# so, we link LLVMSupport lib to matching sycl version only.
5872
if (SYCL_ENABLE_STACK_PRINTING)
@@ -132,7 +146,6 @@ function(add_sycl_rt_library LIB_NAME LIB_OBJ_NAME)
132146
endif()
133147

134148
if (WIN32)
135-
target_link_libraries(${LIB_NAME} PRIVATE shlwapi)
136149
if (ARG_IMPLIB_NAME)
137150
add_custom_command(
138151
TARGET ${LIB_NAME} POST_BUILD
@@ -184,28 +197,6 @@ function(add_sycl_rt_library LIB_NAME LIB_OBJ_NAME)
184197
target_compile_definitions(${LIB_OBJ_NAME} PRIVATE SYCL_EXT_JIT_ENABLE)
185198
endif(SYCL_ENABLE_EXTENSION_JIT)
186199

187-
find_package(Threads REQUIRED)
188-
189-
target_link_libraries(${LIB_NAME}
190-
PRIVATE
191-
${CMAKE_DL_LIBS}
192-
${CMAKE_THREAD_LIBS_INIT}
193-
)
194-
195-
# Link UR
196-
target_link_libraries(${LIB_NAME}
197-
PRIVATE
198-
UnifiedRuntime-Headers
199-
UnifiedRuntimeCommon
200-
)
201-
202-
if (NOT WIN32)
203-
target_link_libraries(${LIB_NAME}
204-
PRIVATE
205-
UnifiedRuntimeLoader
206-
)
207-
endif()
208-
209200
add_common_options(${LIB_NAME} ${LIB_OBJ_NAME})
210201

211202
set_target_properties(${LIB_NAME} PROPERTIES

0 commit comments

Comments
 (0)