From e3cf4d0cf3b83f912474220ff52dfedc5a432084 Mon Sep 17 00:00:00 2001 From: Nick Brown Date: Wed, 15 Sep 2021 14:25:40 +0100 Subject: build: use GNUInstallDirs install destinations So as to be compliant with distribution layouts, as recommend by: https://cmake.org/cmake/help/latest/command/install.html#installing-files Type: make Change-Id: Ic46ace4f26aab1aa4902cbd013c40a92c480680d Signed-off-by: Nick Brown --- src/CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/CMakeLists.txt') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 49ea0373eb4..a957d864fad 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -35,6 +35,7 @@ endif() include(CheckCCompilerFlag) include(CheckIPOSupported) +include(GNUInstallDirs) include(cmake/misc.cmake) include(cmake/cpu.cmake) include(cmake/ccache.cmake) @@ -67,8 +68,8 @@ set(CMAKE_C_COMPILER_TARGET ${CMAKE_SYSTEM_PROCESSOR}-linux-gnu) ############################################################################## check_c_compiler_flag("-Wno-address-of-packed-member" compiler_flag_no_address_of_packed_member) -set(VPP_RUNTIME_DIR "bin" CACHE STRING "Relative runtime directory path") -set(VPP_LIBRARY_DIR "lib" CACHE STRING "Relative library directory path") +set(VPP_RUNTIME_DIR ${CMAKE_INSTALL_BINDIR} CACHE STRING "Relative runtime directory path") +set(VPP_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR} CACHE STRING "Relative library directory path") set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${VPP_RUNTIME_DIR}) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${VPP_LIBRARY_DIR}) -- cgit 1.2.3-korg