67 lines
3.0 KiB
Diff
67 lines
3.0 KiB
Diff
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||
|
|
index 79d451965ed4..78188978d6de 100644
|
||
|
|
--- a/CMakeLists.txt
|
||
|
|
+++ b/CMakeLists.txt
|
||
|
|
@@ -10,6 +10,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)
|
||
|
|
set(LLDB_BUILT_STANDALONE TRUE)
|
||
|
|
endif()
|
||
|
|
@@ -108,7 +110,7 @@ if (LLDB_ENABLE_PYTHON)
|
||
|
|
if(LLDB_BUILD_FRAMEWORK)
|
||
|
|
set(lldb_python_target_dir "${LLDB_FRAMEWORK_ABSOLUTE_BUILD_DIR}/LLDB.framework/Resources/Python/lldb")
|
||
|
|
else()
|
||
|
|
- set(lldb_python_target_dir "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${LLDB_PYTHON_RELATIVE_PATH}/lldb")
|
||
|
|
+ set(lldb_python_target_dir "${CMAKE_INSTALL_LIBDIR}/../${LLDB_PYTHON_RELATIVE_PATH}/lldb")
|
||
|
|
endif()
|
||
|
|
get_target_property(lldb_python_bindings_dir swig_wrapper_python BINARY_DIR)
|
||
|
|
finish_swig_python("lldb-python" "${lldb_python_bindings_dir}" "${lldb_python_target_dir}")
|
||
|
|
@@ -118,7 +120,7 @@ if (LLDB_ENABLE_LUA)
|
||
|
|
if(LLDB_BUILD_FRAMEWORK)
|
||
|
|
set(lldb_lua_target_dir "${LLDB_FRAMEWORK_ABSOLUTE_BUILD_DIR}/LLDB.framework/Resources/Lua")
|
||
|
|
else()
|
||
|
|
- set(lldb_lua_target_dir "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${LLDB_LUA_RELATIVE_PATH}")
|
||
|
|
+ set(lldb_lua_target_dir "${CMAKE_INSTALL_LIBDIR}/../${LLDB_LUA_RELATIVE_PATH}")
|
||
|
|
endif()
|
||
|
|
get_target_property(lldb_lua_bindings_dir swig_wrapper_lua BINARY_DIR)
|
||
|
|
finish_swig_lua("lldb-lua" "${lldb_lua_bindings_dir}" "${lldb_lua_target_dir}")
|
||
|
|
diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake
|
||
|
|
index 3291a7c808e1..b27d27ce6a87 100644
|
||
|
|
--- a/cmake/modules/AddLLDB.cmake
|
||
|
|
+++ b/cmake/modules/AddLLDB.cmake
|
||
|
|
@@ -109,7 +109,7 @@ 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()
|
||
|
|
diff --git a/tools/intel-features/CMakeLists.txt b/tools/intel-features/CMakeLists.txt
|
||
|
|
index 7d48491ec89a..c04543585588 100644
|
||
|
|
--- a/tools/intel-features/CMakeLists.txt
|
||
|
|
+++ b/tools/intel-features/CMakeLists.txt
|
||
|
|
@@ -30,4 +30,4 @@ add_lldb_library(lldbIntelFeatures SHARED
|
||
|
|
)
|
||
|
|
|
||
|
|
install(TARGETS lldbIntelFeatures
|
||
|
|
- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX})
|
||
|
|
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
|
||
|
|
diff --git a/cmake/modules/LLDBStandalone.cmake b/cmake/modules/LLDBStandalone.cmake
|
||
|
|
index 7d48491ec89a..c04543585588 100644
|
||
|
|
--- a/cmake/modules/LLDBStandalone.cmake
|
||
|
|
+++ b/cmake/modules/LLDBStandalone.cmake
|
||
|
|
@@ -70,7 +70,7 @@ endif()
|
||
|
|
|
||
|
|
# They are used as destination of target generators.
|
||
|
|
set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin)
|
||
|
|
-set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX})
|
||
|
|
+set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
|
||
|
|
if(WIN32 OR CYGWIN)
|
||
|
|
# DLL platform -- put DLLs into bin.
|
||
|
|
set(LLVM_SHLIB_OUTPUT_INTDIR ${LLVM_RUNTIME_OUTPUT_INTDIR})
|