From 17bcdcef02153bb0475d2bfceab583b5a09c72f8 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Tue, 1 Mar 2022 17:08:03 +0100 Subject: [PATCH] Fixed installation on other than Ubuntu GNU/Linux distributions. Signed-off-by: Vitaly Zaitsev --- CMakeLists.txt | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d2c40bc..6c8f502 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,24 +42,25 @@ if(MSVC_VERSION GREATER 1910) endif() +include(GNUInstallDirs) include(CMakePackageConfigHelpers) set(FASTFLOAT_VERSION_CONFIG "${CMAKE_CURRENT_BINARY_DIR}/module/FastFloatConfigVersion.cmake") set(FASTFLOAT_PROJECT_CONFIG "${CMAKE_CURRENT_BINARY_DIR}/module/FastFloatConfig.cmake") -set(FASTFLOAT_INSTALL_DIR "share/FastFloat") +set(FASTFLOAT_CONFIG_INSTALL_DIR "${CMAKE_INSTALL_DATAROOTDIR}/cmake/FastFloat") write_basic_package_version_file("${FASTFLOAT_VERSION_CONFIG}" VERSION ${PROJECT_VERSION} COMPATIBILITY SameMajorVersion) configure_package_config_file("cmake/config.cmake.in" "${FASTFLOAT_PROJECT_CONFIG}" - INSTALL_DESTINATION "${FASTFLOAT_INSTALL_DIR}") + INSTALL_DESTINATION "${FASTFLOAT_CONFIG_INSTALL_DIR}") -install(DIRECTORY "${PROJECT_SOURCE_DIR}/include/fast_float" DESTINATION "include") -install(FILES "${FASTFLOAT_PROJECT_CONFIG}" "${FASTFLOAT_VERSION_CONFIG}" DESTINATION "${FASTFLOAT_INSTALL_DIR}") -install(EXPORT ${PROJECT_NAME}-targets NAMESPACE FastFloat:: DESTINATION "${FASTFLOAT_INSTALL_DIR}") +install(DIRECTORY "${PROJECT_SOURCE_DIR}/include/fast_float" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") +install(FILES "${FASTFLOAT_PROJECT_CONFIG}" "${FASTFLOAT_VERSION_CONFIG}" DESTINATION "${FASTFLOAT_CONFIG_INSTALL_DIR}") +install(EXPORT ${PROJECT_NAME}-targets NAMESPACE FastFloat:: DESTINATION "${FASTFLOAT_CONFIG_INSTALL_DIR}") install(TARGETS fast_float EXPORT ${PROJECT_NAME}-targets - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} )