66 lines
2.4 KiB
Diff
66 lines
2.4 KiB
Diff
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||
|
|
index 573b8556989e..a12cc6f6ba77 100644
|
||
|
|
--- a/CMakeLists.txt
|
||
|
|
+++ b/CMakeLists.txt
|
||
|
|
@@ -17,6 +17,8 @@ set(CMAKE_MODULE_PATH
|
||
|
|
# If we are not building as part of LLVM, build LLDB as a standalone project,
|
||
|
|
# using LLVM as an external library.
|
||
|
|
if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
|
||
|
|
+ include(GNUInstallDirs)
|
||
|
|
+
|
||
|
|
project(lldb)
|
||
|
|
include(LLDBStandalone)
|
||
|
|
|
||
|
|
diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake
|
||
|
|
index ecf0b66a41a3..6f2d97af7a11 100644
|
||
|
|
--- a/cmake/modules/AddLLDB.cmake
|
||
|
|
+++ b/cmake/modules/AddLLDB.cmake
|
||
|
|
@@ -107,13 +107,13 @@ function(add_lldb_library name)
|
||
|
|
endif()
|
||
|
|
|
||
|
|
if(PARAM_SHARED)
|
||
|
|
- set(install_dest lib${LLVM_LIBDIR_SUFFIX})
|
||
|
|
+ set(install_dest ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
|
||
|
|
if(PARAM_INSTALL_PREFIX)
|
||
|
|
set(install_dest ${PARAM_INSTALL_PREFIX})
|
||
|
|
endif()
|
||
|
|
# RUNTIME is relevant for DLL platforms, FRAMEWORK for macOS
|
||
|
|
install(TARGETS ${name} COMPONENT ${name}
|
||
|
|
- RUNTIME DESTINATION bin
|
||
|
|
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
||
|
|
LIBRARY DESTINATION ${install_dest}
|
||
|
|
ARCHIVE DESTINATION ${install_dest}
|
||
|
|
FRAMEWORK DESTINATION ${install_dest})
|
||
|
|
diff --git a/cmake/modules/LLDBConfig.cmake b/cmake/modules/LLDBConfig.cmake
|
||
|
|
index 4a15a343ee1d..c74bbb6878d7 100644
|
||
|
|
--- a/cmake/modules/LLDBConfig.cmake
|
||
|
|
+++ b/cmake/modules/LLDBConfig.cmake
|
||
|
|
@@ -238,7 +238,7 @@ include_directories(BEFORE
|
||
|
|
if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
|
||
|
|
install(DIRECTORY include/
|
||
|
|
COMPONENT lldb-headers
|
||
|
|
- DESTINATION include
|
||
|
|
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
|
||
|
|
FILES_MATCHING
|
||
|
|
PATTERN "*.h"
|
||
|
|
PATTERN ".svn" EXCLUDE
|
||
|
|
@@ -247,7 +247,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
|
||
|
|
|
||
|
|
install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/
|
||
|
|
COMPONENT lldb-headers
|
||
|
|
- DESTINATION include
|
||
|
|
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
|
||
|
|
FILES_MATCHING
|
||
|
|
PATTERN "*.h"
|
||
|
|
PATTERN ".svn" EXCLUDE
|
||
|
|
diff --git a/tools/intel-features/CMakeLists.txt b/tools/intel-features/CMakeLists.txt
|
||
|
|
index aff75d7db334..98a527c5e761 100644
|
||
|
|
--- a/tools/intel-features/CMakeLists.txt
|
||
|
|
+++ b/tools/intel-features/CMakeLists.txt
|
||
|
|
@@ -64,4 +64,4 @@ if (LLDB_ENABLE_PYTHON AND LLDB_BUILD_INTEL_PT)
|
||
|
|
endif()
|
||
|
|
|
||
|
|
install(TARGETS lldbIntelFeatures
|
||
|
|
- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX})
|
||
|
|
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
|