105 lines
4.1 KiB
Diff
105 lines
4.1 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 5d52f6450657..a05130cf80b9 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -14,6 +14,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)
|
|
+
|
|
include(LLDBStandalone)
|
|
endif()
|
|
|
|
diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake
|
|
index 4c99278c583b..36d3640a6afc 100644
|
|
--- a/cmake/modules/AddLLDB.cmake
|
|
+++ b/cmake/modules/AddLLDB.cmake
|
|
@@ -94,13 +94,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 e1a133709ff2..357b4bb4492a 100644
|
|
--- a/cmake/modules/LLDBConfig.cmake
|
|
+++ b/cmake/modules/LLDBConfig.cmake
|
|
@@ -335,7 +335,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
|
|
@@ -345,7 +345,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 b5316540fdf3..3c3c882d503f 100644
|
|
--- a/tools/intel-features/CMakeLists.txt
|
|
+++ b/tools/intel-features/CMakeLists.txt
|
|
@@ -64,4 +64,4 @@ if (NOT LLDB_DISABLE_PYTHON AND LLDB_BUILD_INTEL_PT)
|
|
endif()
|
|
|
|
install(TARGETS lldbIntelFeatures
|
|
- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX})
|
|
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index cdf22c4..d56fc6a 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -146,7 +146,7 @@ if (NOT LLDB_DISABLE_PYTHON)
|
|
--cfgBldDir=${lldb_scripts_dir}
|
|
--prefix=${CMAKE_BINARY_DIR}
|
|
--cmakeBuildConfiguration=${CMAKE_CFG_INTDIR}
|
|
- --lldbLibDir=lib${LLVM_LIBDIR_SUFFIX}
|
|
+ --lldbLibDir=${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}
|
|
${use_python_wrapper_from_src_dir}
|
|
${use_six_py_from_system}
|
|
VERBATIM
|
|
diff --git a/cmake/modules/LLDBStandalone.cmake b/cmake/modules/LLDBStandalone.cmake
|
|
index b726797..1f057ac 100644
|
|
--- a/cmake/modules/LLDBStandalone.cmake
|
|
+++ b/cmake/modules/LLDBStandalone.cmake
|
|
@@ -95,7 +95,7 @@ include_directories(
|
|
"${CLANG_INCLUDE_DIRS}")
|
|
|
|
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
|
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX})
|
|
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_INSTALL_LIBDIR}/lib${LLVM_LIBDIR_SUFFIX})
|
|
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX})
|
|
|
|
set(LLDB_BUILT_STANDALONE 1)
|
|
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
|
|
index 7de7973..b70aecc 100644
|
|
--- a/scripts/CMakeLists.txt
|
|
+++ b/scripts/CMakeLists.txt
|
|
@@ -50,7 +50,8 @@ if(NOT LLDB_BUILD_FRAMEWORK)
|
|
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
|
execute_process(
|
|
COMMAND ${PYTHON_EXECUTABLE}
|
|
- -c "import distutils.sysconfig; print(distutils.sysconfig.get_python_lib(True, False, ''))"
|
|
+ -c "import distutils.sysconfig, sys; print(distutils.sysconfig.get_python_lib(True, False, sys.argv[1]))"
|
|
+ ${CMAKE_INSTALL_LIBDIR}/../
|
|
OUTPUT_VARIABLE SWIG_INSTALL_DIR
|
|
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
|
|