diff -up vsomeip-3.1.20.3/CMakeLists.txt.installdirs vsomeip-3.1.20.3/CMakeLists.txt --- vsomeip-3.1.20.3/CMakeLists.txt.installdirs 2022-02-23 10:35:40.360714566 +0100 +++ vsomeip-3.1.20.3/CMakeLists.txt 2022-02-23 10:37:48.283378194 +0100 @@ -6,6 +6,8 @@ cmake_minimum_required (VERSION 2.8.12) project (vsomeip) +include(GNUInstallDirs) + set (VSOMEIP_NAME vsomeip3) set (VSOMEIP_COMPAT_NAME vsomeip) @@ -31,14 +33,14 @@ endif() ################################################################################################### # Offer the user the choice of overriding the installation directories -set (INSTALL_LIB_DIR lib CACHE STRING "Installation directory for libraries") -set (INSTALL_BIN_DIR bin CACHE STRING "Installation directory for executables") -set (INSTALL_INCLUDE_DIR include CACHE STRING "Installation directory for header files") +set (INSTALL_LIB_DIR ${CMAKE_INSTALL_LIBDIR} CACHE PATH "Installation directory for libraries") +set (INSTALL_BIN_DIR ${CMAKE_INSTALL_BINDIR} CACHE PATH "Installation directory for executables") +set (INSTALL_INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE PATH "Installation directory for header files") if (WIN32 AND NOT CYGWIN) set (DEF_INSTALL_CMAKE_DIR CMake) else () - set (DEF_INSTALL_CMAKE_DIR lib/cmake/${VSOMEIP_NAME}) + set (DEF_INSTALL_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/${VSOMEIP_NAME}) endif () set (INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE STRING "Installation directory for CMake files") @@ -457,7 +459,7 @@ export (PACKAGE ${VSOMEIP_COMPAT_NAME}) configure_file (vsomeipConfig.cmake.in "${PROJECT_BINARY_DIR}/vsomeipConfig.cmake" @ONLY) configure_file (vsomeipConfigVersion.cmake.in "${PROJECT_BINARY_DIR}/vsomeipConfigVersion.cmake" @ONLY) -set (COMPAT_INSTALL_CMAKE_DIR "lib/cmake/${VSOMEIP_COMPAT_NAME}") +set (COMPAT_INSTALL_CMAKE_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${VSOMEIP_COMPAT_NAME}") install ( EXPORT vsomeipTargets @@ -474,7 +476,7 @@ install ( ) configure_file(vsomeip.pc.in ${PROJECT_BINARY_DIR}/vsomeip.pc @ONLY) -install(FILES ${PROJECT_BINARY_DIR}/vsomeip.pc DESTINATION lib/pkgconfig) +install(FILES ${PROJECT_BINARY_DIR}/vsomeip.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) endif () @@ -580,7 +582,7 @@ endif() # create pkg-config file if(NOT WIN32) configure_file(vsomeip3.pc.in ${PROJECT_BINARY_DIR}/vsomeip3.pc @ONLY) - install(FILES ${PROJECT_BINARY_DIR}/vsomeip3.pc DESTINATION lib/pkgconfig) + install(FILES ${PROJECT_BINARY_DIR}/vsomeip3.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) endif() ##############################################################################