121 lines
4.7 KiB
Diff
121 lines
4.7 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index cdf22c4b0fc8..8def776f2b4a 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -7,6 +7,8 @@ set(CMAKE_MODULE_PATH
|
|
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
|
|
)
|
|
|
|
+include(GNUInstallDirs)
|
|
+
|
|
include(LLDBStandalone)
|
|
include(LLDBConfig)
|
|
include(AddLLDB)
|
|
diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake
|
|
index f82c11d3d317..776e6d6ef9de 100644
|
|
--- a/cmake/modules/AddLLDB.cmake
|
|
+++ b/cmake/modules/AddLLDB.cmake
|
|
@@ -63,18 +63,18 @@ function(add_lldb_library name)
|
|
set(install_dir ".")
|
|
endif()
|
|
else()
|
|
- set(install_dir lib${LLVM_LIBDIR_SUFFIX})
|
|
+ set(install_dir ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
|
|
endif()
|
|
install(TARGETS ${name}
|
|
COMPONENT ${name}
|
|
- RUNTIME DESTINATION bin
|
|
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
|
LIBRARY DESTINATION ${install_dir}
|
|
ARCHIVE DESTINATION ${install_dir})
|
|
else()
|
|
install(TARGETS ${name}
|
|
COMPONENT ${name}
|
|
- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
|
|
- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX})
|
|
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}
|
|
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
|
|
endif()
|
|
if (NOT CMAKE_CONFIGURATION_TYPES)
|
|
add_llvm_install_targets(install-${name}
|
|
@@ -122,7 +122,7 @@ function(add_lldb_executable name)
|
|
if(ARG_GENERATE_INSTALL)
|
|
install(TARGETS ${name}
|
|
COMPONENT ${name}
|
|
- RUNTIME DESTINATION bin)
|
|
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
|
if (NOT CMAKE_CONFIGURATION_TYPES)
|
|
add_llvm_install_targets(install-${name}
|
|
DEPENDS ${name}
|
|
diff --git a/cmake/modules/LLDBConfig.cmake b/cmake/modules/LLDBConfig.cmake
|
|
index 109c5132d3be..8b9092faa29d 100644
|
|
--- a/cmake/modules/LLDBConfig.cmake
|
|
+++ b/cmake/modules/LLDBConfig.cmake
|
|
@@ -319,7 +319,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
|
|
@@ -329,7 +329,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 a9059dd..d76a47d 100644
|
|
--- a/cmake/modules/LLDBStandalone.cmake
|
|
+++ b/cmake/modules/LLDBStandalone.cmake
|
|
@@ -124,7 +124,7 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
|
|
link_directories("${LLVM_LIBRARY_DIR}")
|
|
|
|
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 3598247..bd60451 100644
|
|
--- a/scripts/CMakeLists.txt
|
|
+++ b/scripts/CMakeLists.txt
|
|
@@ -47,7 +47,7 @@ if(NOT LLDB_BUILD_FRAMEWORK)
|
|
endif()
|
|
|
|
set(SWIG_PYTHON_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${swig_python_subdir})
|
|
- set(SWIG_INSTALL_DIR lib${LLVM_LIBDIR_SUFFIX})
|
|
+ set(SWIG_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
|
|
|
|
# Install the LLDB python module
|
|
install(DIRECTORY ${SWIG_PYTHON_DIR} DESTINATION ${SWIG_INSTALL_DIR})
|