From 120578a40550832fee85700f4a8cf82dee654c4f Mon Sep 17 00:00:00 2001 From: Nick Dingle Date: Wed, 17 Apr 2024 12:04:49 +0000 Subject: [PATCH] Use CMake's GNUInstallDirs --- CMakeLists.txt | 7 ++++--- cmake_uninstall.cmake.in | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 47894de..ae3dc71 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -346,14 +346,15 @@ if(ARMRAL_SEMIHOSTING) target_compile_definitions(armral_utils PUBLIC "ARMRAL_SEMIHOSTING") endif() -install(TARGETS armral DESTINATION lib) +include(GNUInstallDirs) +install(TARGETS armral DESTINATION ${CMAKE_INSTALL_LIBDIR}) install( DIRECTORY include/ - DESTINATION include + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} FILES_MATCHING PATTERN "*.h") install(FILES LICENSE.md THIRD_PARTY_LICENSES.md - DESTINATION share/licenses/armral) + DESTINATION ${CMAKE_INSTALL_DATADIR}/licenses/armral) if(BUILD_TESTING) include(CTest) diff --git a/cmake_uninstall.cmake.in b/cmake_uninstall.cmake.in index e7f5c67..00ba6c2 100644 --- a/cmake_uninstall.cmake.in +++ b/cmake_uninstall.cmake.in @@ -13,7 +13,7 @@ set(INSTALL_BASE_DIR "") # others on the system foreach(file ${files}) if(file MATCHES "armral.a") - string(REGEX REPLACE "/lib/libarmral.a" "" INSTALL_BASE_DIR "${file}") + string(REGEX REPLACE "/@CMAKE_INSTALL_LIBDIR@/libarmral.a" "" INSTALL_BASE_DIR "${file}") endif() get_filename_component(INSTALL_PARENT_DIR "${INSTALL_BASE_DIR}" DIRECTORY) endforeach() -- GitLab