From 8cb9b76a5e85ffab436f7b01ecfc0a0dea7547af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Mon, 3 Oct 2022 20:49:31 +0200 Subject: [PATCH] cmake: Use GNUInstallDirs for configurable install directories Use the standard GNUInstallDirs CMake module to provide configurable install directories rather than hardcoding 'bin', 'lib', etc. Most importantly, this fixes install on modern amd64 systems that use 'lib64' rather than 'lib'. --- CMakeLists.txt | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9cf1050..b10c2c5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,6 +7,7 @@ set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_STANDARD_REQUIRED ON) include(CMakeDependentOption) +include(GNUInstallDirs) option(BUILD_SHARED_LIBS "Compile shared libraries" OFF) option(STORM_SKIP_INSTALL "Skip installing files" OFF) @@ -357,12 +358,12 @@ endif() if (NOT STORM_SKIP_INSTALL) install(TARGETS ${LIBRARY_NAME} - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} FRAMEWORK DESTINATION /Library/Frameworks - PUBLIC_HEADER DESTINATION include - INCLUDES DESTINATION include) + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) #CPack configurtion SET(CPACK_GENERATOR "DEB" "RPM") @@ -395,6 +396,6 @@ endif() if(STORM_BUILD_TESTS) add_executable(StormLib_test ${TEST_SRC_FILES}) target_link_libraries(StormLib_test ${LIBRARY_NAME}) - install(TARGETS StormLib_test RUNTIME DESTINATION bin) + install(TARGETS StormLib_test RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) endif() -- 2.37.3