at 22.05-pre 37 lines 2.0 kB view raw
1diff --git a/CMakeLists.txt b/CMakeLists.txt 2index 9fb35860d483..5739d9e8af62 100644 3--- a/CMakeLists.txt 4+++ b/CMakeLists.txt 5@@ -27,6 +27,8 @@ set(LIBCXXABI_LIBCXX_PATH "${CMAKE_CURRENT_LIST_DIR}/../libcxx" CACHE PATH 6 if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBCXXABI_STANDALONE_BUILD) 7 project(libcxxabi CXX C) 8 9+ include(GNUInstallDirs) 10+ 11 set(PACKAGE_NAME libcxxabi) 12 set(PACKAGE_VERSION 11.0.0git) 13 set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") 14@@ -195,7 +197,7 @@ set(CMAKE_MODULE_PATH 15 if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) 16 set(LIBCXXABI_HEADER_DIR ${LLVM_BINARY_DIR}) 17 set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}) 18- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH 19+ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH 20 "Path where built libc++abi libraries should be installed.") 21 if(LIBCXX_LIBDIR_SUBDIR) 22 string(APPEND LIBCXXABI_LIBRARY_DIR /${LIBCXXABI_LIBDIR_SUBDIR}) 23@@ -204,12 +206,12 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) 24 elseif(LLVM_LIBRARY_OUTPUT_INTDIR) 25 set(LIBCXXABI_HEADER_DIR ${LLVM_BINARY_DIR}) 26 set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) 27- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH 28+ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH 29 "Path where built libc++abi libraries should be installed.") 30 else() 31 set(LIBCXXABI_HEADER_DIR ${CMAKE_BINARY_DIR}) 32 set(LIBCXXABI_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXXABI_LIBDIR_SUFFIX}) 33- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH 34+ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH 35 "Path where built libc++abi libraries should be installed.") 36 endif() 37