From 68d98bb470cf136dd39d19572ac3af758e7f8c65 Mon Sep 17 00:00:00 2001 From: begasus Date: Fri, 10 Mar 2023 19:10:44 +0100 Subject: libcpuid, respect install paths given by $cmakeDirArgs diff --git a/libcpuid/CMakeLists.txt b/libcpuid/CMakeLists.txt index d285f8b..2713766 100644 --- a/libcpuid/CMakeLists.txt +++ b/libcpuid/CMakeLists.txt @@ -58,7 +58,7 @@ endif() # Configuration set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated") -set(config_install_dir "lib/cmake/${PROJECT_NAME}") +set(config_install_dir "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") set(version_config "${generated_dir}/${PROJECT_NAME}ConfigVersion.cmake") set(project_config "${generated_dir}/${PROJECT_NAME}Config.cmake") set(TARGETS_EXPORT_NAME "${PROJECT_NAME}Targets") @@ -78,11 +78,11 @@ configure_package_config_file("${PROJECT_SOURCE_DIR}/cmake/Config.cmake.in" "${p install( TARGETS cpuid EXPORT "${TARGETS_EXPORT_NAME}" - LIBRARY DESTINATION "lib" - ARCHIVE DESTINATION "lib" - RUNTIME DESTINATION "bin" - INCLUDES DESTINATION "include/libcpuid" - PUBLIC_HEADER DESTINATION "include/libcpuid") + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/libcpuid" + PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/libcpuid") install( EXPORT "${TARGETS_EXPORT_NAME}" -- 2.37.3