[SYCL][XPTI] Fix libraries installation path (intel#2286) (intel#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.
tahonermann · Jan 13, 2022 · 1030396 · 1030396
1 parent 4b39793
commit 1030396
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/xpti/src/CMakeLists.txt b/xpti/src/CMakeLists.txt
@@ -11,9 +11,9 @@ macro(add_xpti_lib target_name)
 
   # Set the location of the library installation
   install(TARGETS ${target_name}
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT xpti
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT xpti
-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT xpti
+    RUNTIME DESTINATION bin COMPONENT xpti
+    LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT xpti
+    ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT xpti
   )
 endmacro()
 

diff --git a/xptifw/src/CMakeLists.txt b/xptifw/src/CMakeLists.txt
@@ -24,7 +24,7 @@ endif()
 # Set the location of the library installation
 include(GNUInstallDirs)
 install(TARGETS xptifw
-  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT xptifw
-  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT xptifw
-  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT xptifw
+  RUNTIME DESTINATION bin COMPONENT xptifw
+  LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT xptifw
+  ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT xptifw
 )