Skip to content

Commit ba5ffb8

Browse files
authored
[SYCL] Honor the LLVM_LIBDIR_SUFFIX variable at installation time (#1261)
Install under lib${LLVM_LIBDIR_SUFFIX}/ rather tuna simply lib/ - libsycl.so and its components - libpi_opencl.so - libpi_cuda.so - clc Signed-off-by: Andrea Bocci <[email protected]>
1 parent a3b340b commit ba5ffb8

File tree

7 files changed

+8
-8
lines changed

7 files changed

+8
-8
lines changed

libclc/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,11 +224,11 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} )
224224
endforeach( t )
225225

226226
install(DIRECTORY ${LIBCLC_LIBRARY_OUTPUT_INTDIR}
227-
DESTINATION lib
227+
DESTINATION lib${LLVM_LIBDIR_SUFFIX}
228228
COMPONENT libspirv-builtins
229229
FILES_MATCHING PATTERN "libspirv-*")
230230

231231
install(DIRECTORY ${LIBCLC_LIBRARY_OUTPUT_INTDIR}
232-
DESTINATION lib
232+
DESTINATION lib${LLVM_LIBDIR_SUFFIX}
233233
COMPONENT clc-builtins
234234
FILES_MATCHING PATTERN "clc-*")

sycl/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ add_subdirectory( source )
202202

203203
# Auxilliary extras for SYCL headers/library
204204
if (NOT WIN32)
205-
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/xmethods/$<TARGET_FILE_NAME:sycl>-gdb.py" DESTINATION lib COMPONENT sycl-headers-extras)
205+
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/xmethods/$<TARGET_FILE_NAME:sycl>-gdb.py" DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT sycl-headers-extras)
206206
endif()
207207

208208
# SYCL toolchain builds all components: compiler, libraries, headers, etc.

sycl/plugins/cuda/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,6 @@ target_compile_definitions(
4444
)
4545

4646
install(TARGETS pi_cuda
47-
LIBRARY DESTINATION "lib" COMPONENT pi_cuda
47+
LIBRARY DESTINATION "lib${LLVM_LIBDIR_SUFFIX}" COMPONENT pi_cuda
4848
RUNTIME DESTINATION "bin" COMPONENT pi_cuda
4949
)

sycl/plugins/opencl/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@ target_link_libraries( pi_opencl
3535
add_common_options(pi_opencl)
3636

3737
install(TARGETS pi_opencl
38-
LIBRARY DESTINATION "lib" COMPONENT pi_opencl
38+
LIBRARY DESTINATION "lib${LLVM_LIBDIR_SUFFIX}" COMPONENT pi_opencl
3939
RUNTIME DESTINATION "bin" COMPONENT pi_opencl)

sycl/plugins/opencl/pi_opencl.cpp

100755100644
File mode changed.

sycl/source/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ if (MSVC)
175175
endif()
176176

177177
install(TARGETS ${SYCL_RT_LIBS}
178-
ARCHIVE DESTINATION "lib" COMPONENT sycl
179-
LIBRARY DESTINATION "lib" COMPONENT sycl
178+
ARCHIVE DESTINATION "lib${LLVM_LIBDIR_SUFFIX}" COMPONENT sycl
179+
LIBRARY DESTINATION "lib${LLVM_LIBDIR_SUFFIX}" COMPONENT sycl
180180
RUNTIME DESTINATION "bin" COMPONENT sycl)
181181
add_subdirectory(detail/devicelib)

sycl/source/detail/devicelib/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ endif()
142142
if (WIN32)
143143
set(install_dest bin)
144144
else()
145-
set(install_dest lib)
145+
set(install_dest lib${LLVM_LIBDIR_SUFFIX})
146146
endif()
147147

148148
install(FILES ${devicelib-obj-file}

0 commit comments

Comments
 (0)