From d17016e76cac6784ccbf244b2cf22213d1e3e00e Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Mon, 23 Aug 2021 05:51:30 +0200 Subject: [PATCH] fix(build): relocate cmake and pkgconfig files to an arch-independent path (#635) * Relocate cmake and pkgconfig files to an arch-independent path Use CMAKE_INSTALL_DATADIR instead of CMAKE_INSTALL_LIBDIR for installing the pkgconfig and cmake files. Signed-off-by: Jose Luis Rivero * style: pre-commit.ci fixes Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- CMakeLists.txt | 4 ++-- cmake/CLI11GeneratePkgConfig.cmake | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 169a5a1c..1d7b6716 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -197,14 +197,14 @@ if(CLI11_INSTALL) # Make version available in the install install(FILES "${PROJECT_BINARY_DIR}/CLI11ConfigVersion.cmake" - DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/CLI11") + DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/CLI11") # Install the export target as a file install( EXPORT CLI11Targets FILE CLI11Config.cmake NAMESPACE CLI11:: - DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/CLI11") + DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/CLI11") # Use find_package on the installed package export( diff --git a/cmake/CLI11GeneratePkgConfig.cmake b/cmake/CLI11GeneratePkgConfig.cmake index ed30a5a2..5abb03d1 100644 --- a/cmake/CLI11GeneratePkgConfig.cmake +++ b/cmake/CLI11GeneratePkgConfig.cmake @@ -1,3 +1,3 @@ configure_file("cmake/CLI11.pc.in" "CLI11.pc" @ONLY) -install(FILES "${PROJECT_BINARY_DIR}/CLI11.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") +install(FILES "${PROJECT_BINARY_DIR}/CLI11.pc" DESTINATION "${CMAKE_INSTALL_DATADIR}/pkgconfig")