tjh.dev
1diff --git a/CMakeLists.txt b/CMakeLists.txt
2--- a/CMakeLists.txt
3+++ b/CMakeLists.txt
4@@ -24,7 +24,7 @@ if (OPENMP_STANDALONE_BUILD)
5 set(OPENMP_LIBDIR_SUFFIX "" CACHE STRING
6 "Suffix of lib installation directory, e.g. 64 => lib64")
7 # Do not use OPENMP_LIBDIR_SUFFIX directly, use OPENMP_INSTALL_LIBDIR.
8- set(OPENMP_INSTALL_LIBDIR "lib${OPENMP_LIBDIR_SUFFIX}")
9+ set(OPENMP_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}${OPENMP_LIBDIR_SUFFIX}")
10
11 # Group test settings.
12 set(OPENMP_TEST_C_COMPILER ${CMAKE_C_COMPILER} CACHE STRING
13@@ -35,7 +35,7 @@ if (OPENMP_STANDALONE_BUILD)
14 else()
15 set(OPENMP_ENABLE_WERROR ${LLVM_ENABLE_WERROR})
16 # If building in tree, we honor the same install suffix LLVM uses.
17- set(OPENMP_INSTALL_LIBDIR "lib${LLVM_LIBDIR_SUFFIX}")
18+ set(OPENMP_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}")
19
20 if (NOT MSVC)
21 set(OPENMP_TEST_C_COMPILER ${LLVM_RUNTIME_OUTPUT_INTDIR}/clang)
22diff --git a/libomptarget/plugins/amdgpu/CMakeLists.txt b/libomptarget/plugins/amdgpu/CMakeLists.txt
23--- a/libomptarget/plugins/amdgpu/CMakeLists.txt
24+++ b/libomptarget/plugins/amdgpu/CMakeLists.txt
25@@ -74,7 +74,7 @@ add_library(omptarget.rtl.amdgpu SHARED
26
27 # Install plugin under the lib destination folder.
28 # When we build for debug, OPENMP_LIBDIR_SUFFIX get set to -debug
29-install(TARGETS omptarget.rtl.amdgpu LIBRARY DESTINATION "lib${OPENMP_LIBDIR_SUFFIX}")
30+install(TARGETS omptarget.rtl.amdgpu LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${OPENMP_LIBDIR_SUFFIX}")
31 set_property(TARGET omptarget.rtl.amdgpu PROPERTY INSTALL_RPATH_USE_LINK_PATH ON)
32
33 if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
34diff --git a/libomptarget/plugins/ve/CMakeLists.txt b/libomptarget/plugins/ve/CMakeLists.txt
35--- a/libomptarget/plugins/ve/CMakeLists.txt
36+++ b/libomptarget/plugins/ve/CMakeLists.txt
37@@ -32,7 +32,7 @@ if(${LIBOMPTARGET_DEP_VEO_FOUND})
38
39 # Install plugin under the lib destination folder.
40 install(TARGETS "omptarget.rtl.${tmachine_libname}"
41- LIBRARY DESTINATION lib${OPENMP_LIBDIR_SUFFIX})
42+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${OPENMP_LIBDIR_SUFFIX})
43
44 target_link_libraries(
45 "omptarget.rtl.${tmachine_libname}"