Skip to content

Commit 1030396

Browse files
authored
[SYCL][XPTI] Fix libraries installation path (#2286) (#5288)
Align installation rules for XPTI libraries with the ones used for OpenCL ICD loader to avoid installing to lib64 directory. That causes missing of the libraries during E2E testing: - llvm_test_suite_sycl/xpti_buffer* tests are impacted.
1 parent 4b39793 commit 1030396

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

xpti/src/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ macro(add_xpti_lib target_name)
1111

1212
# Set the location of the library installation
1313
install(TARGETS ${target_name}
14-
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT xpti
15-
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT xpti
16-
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT xpti
14+
RUNTIME DESTINATION bin COMPONENT xpti
15+
LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT xpti
16+
ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT xpti
1717
)
1818
endmacro()
1919

xptifw/src/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ endif()
2424
# Set the location of the library installation
2525
include(GNUInstallDirs)
2626
install(TARGETS xptifw
27-
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT xptifw
28-
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT xptifw
29-
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT xptifw
27+
RUNTIME DESTINATION bin COMPONENT xptifw
28+
LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT xptifw
29+
ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT xptifw
3030
)

0 commit comments

Comments
 (0)