29 lines
1.1 KiB
Diff
29 lines
1.1 KiB
Diff
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||
|
|
index 0e48d713837a..05483c367bd1 100644
|
||
|
|
--- a/CMakeLists.txt
|
||
|
|
+++ b/CMakeLists.txt
|
||
|
|
@@ -18,6 +18,8 @@ set(CMAKE_MODULE_PATH
|
||
|
|
if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
|
||
|
|
project(libunwind)
|
||
|
|
|
||
|
|
+ include(GNUInstallDirs)
|
||
|
|
+
|
||
|
|
# Rely on llvm-config.
|
||
|
|
set(CONFIG_OUTPUT)
|
||
|
|
if(NOT LLVM_CONFIG_PATH)
|
||
|
|
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||
|
|
index 937159e2cb86..07f8b936e7e5 100644
|
||
|
|
--- a/src/CMakeLists.txt
|
||
|
|
+++ b/src/CMakeLists.txt
|
||
|
|
@@ -141,8 +141,8 @@ add_custom_target(unwind DEPENDS ${LIBUNWIND_BUILD_TARGETS})
|
||
|
|
|
||
|
|
if (LIBUNWIND_INSTALL_LIBRARY)
|
||
|
|
install(TARGETS ${LIBUNWIND_INSTALL_TARGETS}
|
||
|
|
- LIBRARY DESTINATION ${LIBUNWIND_INSTALL_PREFIX}lib${LIBUNWIND_LIBDIR_SUFFIX} COMPONENT unwind
|
||
|
|
- ARCHIVE DESTINATION ${LIBUNWIND_INSTALL_PREFIX}lib${LIBUNWIND_LIBDIR_SUFFIX} COMPONENT unwind)
|
||
|
|
+ LIBRARY DESTINATION ${LIBUNWIND_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBUNWIND_LIBDIR_SUFFIX} COMPONENT unwind
|
||
|
|
+ ARCHIVE DESTINATION ${LIBUNWIND_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBUNWIND_LIBDIR_SUFFIX} COMPONENT unwind)
|
||
|
|
endif()
|
||
|
|
|
||
|
|
if (NOT CMAKE_CONFIGURATION_TYPES AND LIBUNWIND_INSTALL_LIBRARY)
|