at 24.05-pre 2.8 kB view raw
1diff --git a/CMakeLists.txt b/CMakeLists.txt 2index 00ddcdc1488f..af2aa238939a 100644 3--- a/CMakeLists.txt 4+++ b/CMakeLists.txt 5@@ -7,6 +7,8 @@ set(CMAKE_MODULE_PATH 6 "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" 7 ) 8 9+include(GNUInstallDirs) 10+ 11 include(LLDBStandalone) 12 include(LLDBConfig) 13 include(AddLLDB) 14diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake 15index 129a5ef7500d..fb3fb3ce655c 100644 16--- a/cmake/modules/AddLLDB.cmake 17+++ b/cmake/modules/AddLLDB.cmake 18@@ -56,14 +56,14 @@ function(add_lldb_library name) 19 endif() 20 install(TARGETS ${name} 21 COMPONENT ${name} 22- RUNTIME DESTINATION bin 23+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} 24 LIBRARY DESTINATION ${out_dir} 25 ARCHIVE DESTINATION ${out_dir}) 26 else() 27 install(TARGETS ${name} 28 COMPONENT ${name} 29- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} 30- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) 31+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} 32+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) 33 endif() 34 if (NOT CMAKE_CONFIGURATION_TYPES) 35 add_llvm_install_targets(install-${name} 36@@ -121,7 +121,7 @@ function(add_lldb_executable name) 37 endif() 38 39 if(ARG_GENERATE_INSTALL) 40- set(out_dir "bin") 41+ set(out_dir "${CMAKE_INSTALL_BINDIR}") 42 if (LLDB_BUILD_FRAMEWORK AND ARG_INCLUDE_IN_SUITE) 43 set(out_dir ${LLDB_FRAMEWORK_INSTALL_DIR}/${LLDB_FRAMEWORK_RESOURCE_DIR}) 44 endif() 45diff --git a/cmake/modules/LLDBConfig.cmake b/cmake/modules/LLDBConfig.cmake 46index dae6e365da38..ef272d5de5c0 100644 47--- a/cmake/modules/LLDBConfig.cmake 48+++ b/cmake/modules/LLDBConfig.cmake 49@@ -278,7 +278,7 @@ include_directories(BEFORE 50 if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) 51 install(DIRECTORY include/ 52 COMPONENT lldb-headers 53- DESTINATION include 54+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} 55 FILES_MATCHING 56 PATTERN "*.h" 57 PATTERN ".svn" EXCLUDE 58@@ -288,7 +288,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) 59 60 install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/ 61 COMPONENT lldb-headers 62- DESTINATION include 63+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} 64 FILES_MATCHING 65 PATTERN "*.h" 66 PATTERN ".svn" EXCLUDE 67diff --git a/tools/intel-features/CMakeLists.txt b/tools/intel-features/CMakeLists.txt 68index b5316540fdf3..3c3c882d503f 100644 69--- a/tools/intel-features/CMakeLists.txt 70+++ b/tools/intel-features/CMakeLists.txt 71@@ -64,4 +64,4 @@ if (NOT LLDB_DISABLE_PYTHON AND LLDB_BUILD_INTEL_PT) 72 endif() 73 74 install(TARGETS lldbIntelFeatures 75- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}) 76+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})