at 23.05-pre 1.2 kB view raw
1diff --git a/CMakeLists.txt b/CMakeLists.txt 2index 0e48d713837a..05483c367bd1 100644 3--- a/CMakeLists.txt 4+++ b/CMakeLists.txt 5@@ -18,6 +18,8 @@ set(CMAKE_MODULE_PATH 6 if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) 7 project(libunwind) 8 9+ include(GNUInstallDirs) 10+ 11 # Rely on llvm-config. 12 set(CONFIG_OUTPUT) 13 if(NOT LLVM_CONFIG_PATH) 14diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt 15index 937159e2cb86..07f8b936e7e5 100644 16--- a/src/CMakeLists.txt 17+++ b/src/CMakeLists.txt 18@@ -141,8 +141,8 @@ add_custom_target(unwind DEPENDS ${LIBUNWIND_BUILD_TARGETS}) 19 20 if (LIBUNWIND_INSTALL_LIBRARY) 21 install(TARGETS ${LIBUNWIND_INSTALL_TARGETS} 22- LIBRARY DESTINATION ${LIBUNWIND_INSTALL_PREFIX}lib${LIBUNWIND_LIBDIR_SUFFIX} COMPONENT unwind 23- ARCHIVE DESTINATION ${LIBUNWIND_INSTALL_PREFIX}lib${LIBUNWIND_LIBDIR_SUFFIX} COMPONENT unwind) 24+ LIBRARY DESTINATION ${LIBUNWIND_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBUNWIND_LIBDIR_SUFFIX} COMPONENT unwind 25+ ARCHIVE DESTINATION ${LIBUNWIND_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBUNWIND_LIBDIR_SUFFIX} COMPONENT unwind) 26 endif() 27 28 if (NOT CMAKE_CONFIGURATION_TYPES AND LIBUNWIND_INSTALL_LIBRARY)