pyrox.dev
1diff --git a/CMakeLists.txt b/CMakeLists.txt
2index 79d451965ed4..78188978d6de 100644
3--- a/CMakeLists.txt
4+++ b/CMakeLists.txt
5@@ -10,6 +10,8 @@ set(CMAKE_MODULE_PATH
6 # If we are not building as part of LLVM, build LLDB as a standalone project,
7 # using LLVM as an external library.
8 if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
9+ include(GNUInstallDirs)
10+
11 project(lldb)
12 set(LLDB_BUILT_STANDALONE TRUE)
13 endif()
14@@ -108,7 +110,7 @@ if (LLDB_ENABLE_PYTHON)
15 if(LLDB_BUILD_FRAMEWORK)
16 set(lldb_python_target_dir "${LLDB_FRAMEWORK_ABSOLUTE_BUILD_DIR}/LLDB.framework/Resources/Python/lldb")
17 else()
18- set(lldb_python_target_dir "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${LLDB_PYTHON_RELATIVE_PATH}/lldb")
19+ set(lldb_python_target_dir "${CMAKE_INSTALL_LIBDIR}/../${LLDB_PYTHON_RELATIVE_PATH}/lldb")
20 endif()
21 get_target_property(lldb_python_bindings_dir swig_wrapper_python BINARY_DIR)
22 finish_swig_python("lldb-python" "${lldb_python_bindings_dir}" "${lldb_python_target_dir}")
23@@ -118,7 +120,7 @@ if (LLDB_ENABLE_LUA)
24 if(LLDB_BUILD_FRAMEWORK)
25 set(lldb_lua_target_dir "${LLDB_FRAMEWORK_ABSOLUTE_BUILD_DIR}/LLDB.framework/Resources/Lua")
26 else()
27- set(lldb_lua_target_dir "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${LLDB_LUA_RELATIVE_PATH}")
28+ set(lldb_lua_target_dir "${CMAKE_INSTALL_LIBDIR}/../${LLDB_LUA_RELATIVE_PATH}")
29 endif()
30 get_target_property(lldb_lua_bindings_dir swig_wrapper_lua BINARY_DIR)
31 finish_swig_lua("lldb-lua" "${lldb_lua_bindings_dir}" "${lldb_lua_target_dir}")
32diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake
33index 3291a7c808e1..b27d27ce6a87 100644
34--- a/cmake/modules/AddLLDB.cmake
35+++ b/cmake/modules/AddLLDB.cmake
36@@ -109,7 +109,7 @@ function(add_lldb_library name)
37 endif()
38
39 if(PARAM_SHARED)
40- set(install_dest lib${LLVM_LIBDIR_SUFFIX})
41+ set(install_dest ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
42 if(PARAM_INSTALL_PREFIX)
43 set(install_dest ${PARAM_INSTALL_PREFIX})
44 endif()
45diff --git a/tools/intel-features/CMakeLists.txt b/tools/intel-features/CMakeLists.txt
46index 7d48491ec89a..c04543585588 100644
47--- a/tools/intel-features/CMakeLists.txt
48+++ b/tools/intel-features/CMakeLists.txt
49@@ -30,4 +30,4 @@ add_lldb_library(lldbIntelFeatures SHARED
50 )
51
52 install(TARGETS lldbIntelFeatures
53- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX})
54+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
55diff --git a/cmake/modules/LLDBStandalone.cmake b/cmake/modules/LLDBStandalone.cmake
56index 7d48491ec89a..c04543585588 100644
57--- a/cmake/modules/LLDBStandalone.cmake
58+++ b/cmake/modules/LLDBStandalone.cmake
59@@ -70,7 +70,7 @@ endif()
60
61 # They are used as destination of target generators.
62 set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin)
63-set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX})
64+set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
65 if(WIN32 OR CYGWIN)
66 # DLL platform -- put DLLs into bin.
67 set(LLVM_SHLIB_OUTPUT_INTDIR ${LLVM_RUNTIME_OUTPUT_INTDIR})