Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SYCL] Honor the LLVM_LIBDIR_SUFFIX variable at installation time #1261

Merged
merged 1 commit into from
Mar 10, 2020
Merged

[SYCL] Honor the LLVM_LIBDIR_SUFFIX variable at installation time #1261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions libclc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,11 +224,11 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} )
endforeach( t )

install(DIRECTORY ${LIBCLC_LIBRARY_OUTPUT_INTDIR}
DESTINATION lib
DESTINATION lib${LLVM_LIBDIR_SUFFIX}
COMPONENT libspirv-builtins
FILES_MATCHING PATTERN "libspirv-*")

install(DIRECTORY ${LIBCLC_LIBRARY_OUTPUT_INTDIR}
DESTINATION lib
DESTINATION lib${LLVM_LIBDIR_SUFFIX}
COMPONENT clc-builtins
FILES_MATCHING PATTERN "clc-*")
2 changes: 1 addition & 1 deletion sycl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ add_subdirectory( source )

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

# SYCL toolchain builds all components: compiler, libraries, headers, etc.
Expand Down
2 changes: 1 addition & 1 deletion sycl/plugins/cuda/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,6 @@ target_compile_definitions(
)

install(TARGETS pi_cuda
LIBRARY DESTINATION "lib" COMPONENT pi_cuda
LIBRARY DESTINATION "lib${LLVM_LIBDIR_SUFFIX}" COMPONENT pi_cuda
RUNTIME DESTINATION "bin" COMPONENT pi_cuda
)
2 changes: 1 addition & 1 deletion sycl/plugins/opencl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@ target_link_libraries( pi_opencl
add_common_options(pi_opencl)

install(TARGETS pi_opencl
LIBRARY DESTINATION "lib" COMPONENT pi_opencl
LIBRARY DESTINATION "lib${LLVM_LIBDIR_SUFFIX}" COMPONENT pi_opencl
RUNTIME DESTINATION "bin" COMPONENT pi_opencl)
Empty file modified sycl/plugins/opencl/pi_opencl.cpp
100755 → 100644
View file
Open in desktop
Empty file.
4 changes: 2 additions & 2 deletions sycl/source/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ if (MSVC)
endif()

install(TARGETS ${SYCL_RT_LIBS}
ARCHIVE DESTINATION "lib" COMPONENT sycl
LIBRARY DESTINATION "lib" COMPONENT sycl
ARCHIVE DESTINATION "lib${LLVM_LIBDIR_SUFFIX}" COMPONENT sycl
LIBRARY DESTINATION "lib${LLVM_LIBDIR_SUFFIX}" COMPONENT sycl
RUNTIME DESTINATION "bin" COMPONENT sycl)
add_subdirectory(detail/devicelib)
2 changes: 1 addition & 1 deletion sycl/source/detail/devicelib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ endif()
if (WIN32)
set(install_dest bin)
else()
set(install_dest lib)
set(install_dest lib${LLVM_LIBDIR_SUFFIX})
endif()

install(FILES ${devicelib-obj-file}
Expand Down