[SYCL] Honor the LLVM_LIBDIR_SUFFIX variable at installation time

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]>

Author: fwyzard

libclc/CMakeLists.txt

@@ -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-*")

sycl/CMakeLists.txt

@@ -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.

sycl/plugins/cuda/CMakeLists.txt

@@ -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
 )

sycl/plugins/opencl/CMakeLists.txt

@@ -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)

sycl/plugins/opencl/pi_opencl.cpp

@@ -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)

sycl/source/CMakeLists.txt

@@ -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}