pyrox.dev
1diff --git a/CMakeLists.txt b/CMakeLists.txt
2index 573b8556989e..a12cc6f6ba77 100644
3--- a/CMakeLists.txt
4+++ b/CMakeLists.txt
5@@ -17,6 +17,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 include(LLDBStandalone)
13
14diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake
15index ecf0b66a41a3..6f2d97af7a11 100644
16--- a/cmake/modules/AddLLDB.cmake
17+++ b/cmake/modules/AddLLDB.cmake
18@@ -107,13 +107,13 @@ function(add_lldb_library name)
19 endif()
20
21 if(PARAM_SHARED)
22- set(install_dest lib${LLVM_LIBDIR_SUFFIX})
23+ set(install_dest ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
24 if(PARAM_INSTALL_PREFIX)
25 set(install_dest ${PARAM_INSTALL_PREFIX})
26 endif()
27 # RUNTIME is relevant for DLL platforms, FRAMEWORK for macOS
28 install(TARGETS ${name} COMPONENT ${name}
29- RUNTIME DESTINATION bin
30+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
31 LIBRARY DESTINATION ${install_dest}
32 ARCHIVE DESTINATION ${install_dest}
33 FRAMEWORK DESTINATION ${install_dest})
34diff --git a/cmake/modules/LLDBConfig.cmake b/cmake/modules/LLDBConfig.cmake
35index 4a15a343ee1d..c74bbb6878d7 100644
36--- a/cmake/modules/LLDBConfig.cmake
37+++ b/cmake/modules/LLDBConfig.cmake
38@@ -238,7 +238,7 @@ include_directories(BEFORE
39 if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
40 install(DIRECTORY include/
41 COMPONENT lldb-headers
42- DESTINATION include
43+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
44 FILES_MATCHING
45 PATTERN "*.h"
46 PATTERN ".svn" EXCLUDE
47@@ -247,7 +247,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
48
49 install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/
50 COMPONENT lldb-headers
51- DESTINATION include
52+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
53 FILES_MATCHING
54 PATTERN "*.h"
55 PATTERN ".svn" EXCLUDE
56diff --git a/tools/intel-features/CMakeLists.txt b/tools/intel-features/CMakeLists.txt
57index aff75d7db334..98a527c5e761 100644
58--- a/tools/intel-features/CMakeLists.txt
59+++ b/tools/intel-features/CMakeLists.txt
60@@ -64,4 +64,4 @@ if (LLDB_ENABLE_PYTHON AND LLDB_BUILD_INTEL_PT)
61 endif()
62
63 install(TARGETS lldbIntelFeatures
64- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX})
65+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
66diff --git a/cmake/modules/LLDBStandalone.cmake b/cmake/modules/LLDBStandalone.cmake
67index 752113b..010f187 100644
68--- a/cmake/modules/LLDBStandalone.cmake
69+++ b/cmake/modules/LLDBStandalone.cmake
70@@ -62,7 +62,7 @@ endif()
71
72 # They are used as destination of target generators.
73 set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin)
74-set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX})
75+set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
76 if(WIN32 OR CYGWIN)
77 # DLL platform -- put DLLs into bin.
78 set(LLVM_SHLIB_OUTPUT_INTDIR ${LLVM_RUNTIME_OUTPUT_INTDIR})
79diff --git a/CMakeLists.txt b/CMakeLists.txt
80index bf74802..1c98cae 100644
81--- a/CMakeLists.txt
82+++ b/CMakeLists.txt
83@@ -222,7 +222,7 @@ if (LLDB_ENABLE_PYTHON)
84 if(LLDB_BUILD_FRAMEWORK)
85 set(LLDB_PYTHON_INSTALL_PATH ${LLDB_FRAMEWORK_INSTALL_DIR}/LLDB.framework/Resources/Python)
86 else()
87- set(LLDB_PYTHON_INSTALL_PATH ${LLDB_PYTHON_RELATIVE_PATH})
88+ set(LLDB_PYTHON_INSTALL_PATH ${CMAKE_INSTALL_LIBDIR}/../${LLDB_PYTHON_RELATIVE_PATH})
89 endif()
90 if (NOT CMAKE_CFG_INTDIR STREQUAL ".")
91 string(REPLACE ${CMAKE_CFG_INTDIR} "\$\{CMAKE_INSTALL_CONFIG_NAME\}" LLDB_PYTHON_INSTALL_PATH ${LLDB_PYTHON_INSTALL_PATH})