at 23.05-pre 76 lines 2.8 kB view raw
1diff --git a/CMakeLists.txt b/CMakeLists.txt 2index ada293811b3e..6c2149309f65 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 4c6f1efd673d..179a12b49cce 100644 16--- a/cmake/modules/AddLLDB.cmake 17+++ b/cmake/modules/AddLLDB.cmake 18@@ -54,14 +54,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_custom_target(install-${name} 36@@ -126,7 +126,7 @@ function(add_lldb_executable name) 37 if(ARG_GENERATE_INSTALL AND NOT (ARG_INCLUDE_IN_FRAMEWORK AND LLDB_BUILD_FRAMEWORK )) 38 install(TARGETS ${name} 39 COMPONENT ${name} 40- RUNTIME DESTINATION bin) 41+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) 42 if (NOT CMAKE_CONFIGURATION_TYPES) 43 add_custom_target(install-${name} 44 DEPENDS ${name} 45diff --git a/cmake/modules/LLDBConfig.cmake b/cmake/modules/LLDBConfig.cmake 46index 726552675f47..f1f769f34446 100644 47--- a/cmake/modules/LLDBConfig.cmake 48+++ b/cmake/modules/LLDBConfig.cmake 49@@ -276,7 +276,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@@ -286,7 +286,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-mpx/CMakeLists.txt b/tools/intel-mpx/CMakeLists.txt 68index 29ba9a1cacec..30e2f9334b95 100644 69--- a/tools/intel-mpx/CMakeLists.txt 70+++ b/tools/intel-mpx/CMakeLists.txt 71@@ -12,4 +12,4 @@ target_link_libraries(lldb-intel-mpxtable 72 PUBLIC liblldb LLVMSupport) 73 74 install(TARGETS lldb-intel-mpxtable 75- LIBRARY DESTINATION bin) 76+ LIBRARY DESTINATION ${CMAKE_INSTALL_BINDIR})