ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: use GNUInstallDirs install destinations

Browse Source 
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 <nickbroon@gmail.com>
This commit is contained in:
Nick Brown
2021-09-15 14:25:40 +01:00
committed by Damjan Marion
parent 8b99777263
commit e3cf4d0cf3
8 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/CMakeLists.txt
View File

@ -35,6 +35,7 @@ endif()
include(CheckCCompilerFlag) include(CheckCCompilerFlag)
include(CheckIPOSupported) include(CheckIPOSupported)
include(GNUInstallDirs)
include(cmake/misc.cmake) include(cmake/misc.cmake)
include(cmake/cpu.cmake) include(cmake/cpu.cmake)
include(cmake/ccache.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" check_c_compiler_flag("-Wno-address-of-packed-member"
compiler_flag_no_address_of_packed_member) compiler_flag_no_address_of_packed_member)
set(VPP_RUNTIME_DIR "bin" CACHE STRING "Relative runtime directory path") set(VPP_RUNTIME_DIR ${CMAKE_INSTALL_BINDIR} CACHE STRING "Relative runtime directory path")
set(VPP_LIBRARY_DIR "lib" CACHE STRING "Relative library 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_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${VPP_RUNTIME_DIR})
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${VPP_LIBRARY_DIR}) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${VPP_LIBRARY_DIR})

2
src/vat/CMakeLists.txt
View File

@ -58,7 +58,7 @@ add_vpp_executable(vpp_json_test ENABLE_EXPORTS NO_INSTALL
############################################################################## ##############################################################################
install( install(
FILES vat.h json_format.h FILES vat.h json_format.h
DESTINATION include/vat DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/vat
COMPONENT vpp-dev COMPONENT vpp-dev
) )

2
src/vat2/CMakeLists.txt
View File

@ -98,6 +98,6 @@ install(
FILES FILES
jsonconvert.h jsonconvert.h
vat2_helpers.h vat2_helpers.h
DESTINATION include/vat2 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/vat2
COMPONENT vpp-dev COMPONENT vpp-dev
) )

2
src/vlib/CMakeLists.txt
View File

@ -41,7 +41,7 @@ configure_file(
) )
install( install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/config.h FILES ${CMAKE_CURRENT_BINARY_DIR}/config.h
DESTINATION include/vlib DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/vlib
COMPONENT vpp-dev COMPONENT vpp-dev
) )

2
src/vlibapi/CMakeLists.txt
View File

@ -20,7 +20,7 @@ install(
api_types.h api_types.h
DESTINATION DESTINATION
include/vlibapi ${CMAKE_INSTALL_INCLUDEDIR}/vlibapi
COMPONENT vpp-dev COMPONENT vpp-dev
) )

2
src/vpp-api/vapi/CMakeLists.txt
View File

@ -34,7 +34,7 @@ install(
vapi.hpp vapi.hpp
vapi_internal.h vapi_internal.h
DESTINATION DESTINATION
include/vapi ${CMAKE_INSTALL_INCLUDEDIR}/vapi
COMPONENT COMPONENT
vpp-dev vpp-dev
) )

6
src/vpp/CMakeLists.txt
View File

@ -51,7 +51,7 @@ foreach(file ${VPP_API_FILES})
FILES ${CMAKE_CURRENT_BINARY_DIR}/${file}.h FILES ${CMAKE_CURRENT_BINARY_DIR}/${file}.h
${CMAKE_CURRENT_BINARY_DIR}/${file}_enum.h ${CMAKE_CURRENT_BINARY_DIR}/${file}_enum.h
${CMAKE_CURRENT_BINARY_DIR}/${file}_types.h ${CMAKE_CURRENT_BINARY_DIR}/${file}_types.h
DESTINATION include/vpp/${dir} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/vpp/${dir}
COMPONENT vpp-dev COMPONENT vpp-dev
) )
endforeach() endforeach()
@ -133,8 +133,8 @@ add_vpp_library(vppmem_preload
LINK_LIBRARIES vppinfra LINK_LIBRARIES vppinfra
) )
install(FILES conf/startup.conf DESTINATION etc/vpp COMPONENT vpp) install(FILES conf/startup.conf DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/vpp COMPONENT vpp)
install(FILES conf/80-vpp.conf DESTINATION etc/sysctl.d COMPONENT vpp) install(FILES conf/80-vpp.conf DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/sysctl.d COMPONENT vpp)
############################################################################## ##############################################################################
# VAT2 plugins # VAT2 plugins

2
src/vppinfra/CMakeLists.txt
View File

@ -32,7 +32,7 @@ configure_file(
install( install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/config.h FILES ${CMAKE_CURRENT_BINARY_DIR}/config.h
DESTINATION include/vppinfra DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/vppinfra
COMPONENT vpp-dev COMPONENT vpp-dev
) )