From 0d65c903c600d983eabfa5be793fa60c346d8303 Mon Sep 17 00:00:00 2001 From: Jason Zaman Date: Sun, 14 Apr 2019 16:38:10 +0800 Subject: [PATCH] CMake: install to correct lib dir 64-bit libraries should be installed in /usr/lib64, not in /usr/lib/ Make the destination lib dir configurable. Commit e13e72e17692f5dc0036460d734c637b563f3ac7 removed include(GNUInstallDirs) and ${CMAKE_INSTALL_LIBDIR} which broke installing on 64-bit systems. Signed-off-by: Jason Zaman --- CMakeLists.txt | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d9f4be8..2a06c71 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,12 +40,13 @@ endif() #### # Installation (https://github.com/forexample/package-example) +include(GNUInstallDirs) + # Layout. This works for all platforms: # * /lib/cmake/ # * /lib/ # * /include/ -set(config_install_dir "lib/cmake/${PROJECT_NAME}") -set(include_install_dir "include") +set(config_install_dir "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated") @@ -81,17 +82,17 @@ configure_package_config_file( install( TARGETS double-conversion EXPORT "${targets_export_name}" - LIBRARY DESTINATION "lib" - ARCHIVE DESTINATION "lib" - RUNTIME DESTINATION "bin" - INCLUDES DESTINATION "${include_install_dir}" + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" ) # Headers: # * double-conversion/*.h -> /include/double-conversion/*.h install( FILES ${headers} - DESTINATION "${include_install_dir}/double-conversion" + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/double-conversion" ) # Config -- 2.21.0