diff --git a/libclc/CMakeLists.txt b/libclc/CMakeLists.txt index bcc9317f9867b..e387c3b08a017 100644 --- a/libclc/CMakeLists.txt +++ b/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-*") diff --git a/sycl/CMakeLists.txt b/sycl/CMakeLists.txt index 8b2883ceca745..35b6de9052edb 100644 --- a/sycl/CMakeLists.txt +++ b/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/$-gdb.py" DESTINATION lib COMPONENT sycl-headers-extras) + install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/xmethods/$-gdb.py" DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT sycl-headers-extras) endif() # SYCL toolchain builds all components: compiler, libraries, headers, etc. diff --git a/sycl/plugins/cuda/CMakeLists.txt b/sycl/plugins/cuda/CMakeLists.txt index 60a2b4bebbf2d..0b8b5e302337d 100644 --- a/sycl/plugins/cuda/CMakeLists.txt +++ b/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 ) diff --git a/sycl/plugins/opencl/CMakeLists.txt b/sycl/plugins/opencl/CMakeLists.txt index f9953bbed30cc..b085d53ba8175 100644 --- a/sycl/plugins/opencl/CMakeLists.txt +++ b/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) diff --git a/sycl/plugins/opencl/pi_opencl.cpp b/sycl/plugins/opencl/pi_opencl.cpp old mode 100755 new mode 100644 diff --git a/sycl/source/CMakeLists.txt b/sycl/source/CMakeLists.txt index 6c2243fec3ed3..9203ce17a4e66 100644 --- a/sycl/source/CMakeLists.txt +++ b/sycl/source/CMakeLists.txt @@ -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) diff --git a/sycl/source/detail/devicelib/CMakeLists.txt b/sycl/source/detail/devicelib/CMakeLists.txt index 99aab2e4c7f1e..84bc9f6225bef 100644 --- a/sycl/source/detail/devicelib/CMakeLists.txt +++ b/sycl/source/detail/devicelib/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}