at 23.05-pre 36 lines 1.3 kB view raw
1diff --git a/CMakeLists.txt b/CMakeLists.txt 2index 79d451965ed4..78188978d6de 100644 3--- a/CMakeLists.txt 4+++ b/CMakeLists.txt 5@@ -12,6 +12,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 3291a7c808e1..b27d27ce6a87 100644 16--- a/cmake/modules/AddLLDB.cmake 17+++ b/cmake/modules/AddLLDB.cmake 18@@ -109,7 +109,7 @@ 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() 27diff --git a/tools/intel-features/CMakeLists.txt b/tools/intel-features/CMakeLists.txt 28index 7d48491ec89a..c04543585588 100644 29--- a/tools/intel-features/CMakeLists.txt 30+++ b/tools/intel-features/CMakeLists.txt 31@@ -30,4 +30,4 @@ add_lldb_library(lldbIntelFeatures SHARED 32 ) 33 34 install(TARGETS lldbIntelFeatures 35- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}) 36+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})