X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fvpp%2FCMakeLists.txt;h=a5ac2f6d81a39bcd184e62c34d760779b6341da1;hb=85fc13004df7f67012a04e73564ecef1b3641ef3;hp=601bc0397d62063152bd42a429c652b7774efbbe;hpb=f94c63ea392a79b509a7b8263f5a9372a58786f9;p=vpp.git diff --git a/src/vpp/CMakeLists.txt b/src/vpp/CMakeLists.txt index 601bc0397d6..a5ac2f6d81a 100644 --- a/src/vpp/CMakeLists.txt +++ b/src/vpp/CMakeLists.txt @@ -35,8 +35,6 @@ option(VPP_API_TEST_BUILTIN "Use builtin VPP API test." ON) set(VPP_API_FILES api/vpe.api - stats/stats.api - oam/oam.api ) vpp_add_api_files(vpp ${VPP_API_FILES}) @@ -54,13 +52,11 @@ set(VPP_SOURCES vnet/main.c app/vpe_cli.c app/version.c - oam/oam.c - oam/oam_api.c - stats/stats_to_be_deprecated.c stats/stat_segment.c api/api.c api/json_format.c api/custom_dump.c + api/types.c ) if(VPP_API_TEST_BUILTIN) @@ -68,6 +64,7 @@ if(VPP_API_TEST_BUILTIN) api/api_format.c api/api_main.c api/plugin.c + api/types.c ) add_definitions(-DVPP_API_TEST_BUILTIN=1) endif() @@ -82,6 +79,7 @@ add_vpp_executable(vpp add_vpp_headers(vpp api/vpe_msg_enum.h api/vpe_all_api_h.h + stats/stat_segment.h ) ############################################################################## @@ -104,13 +102,6 @@ add_vpp_executable(vpp_get_metrics ############################################################################## # stats binaries ############################################################################## -add_vpp_executable(summary_stats_client - SOURCES api/summary_stats_client.c - LINK_LIBRARIES vppinfra svm vlibmemoryclient - DEPENDS api_headers - NO_INSTALL -) - add_vpp_executable(vpp_get_stats SOURCES app/vpp_get_stats.c LINK_LIBRARIES vppapiclient vppinfra @@ -122,3 +113,6 @@ add_vpp_executable(vpp_prometheus_export LINK_LIBRARIES vppapiclient vppinfra svm vlibmemoryclient DEPENDS api_headers ) + +install(FILES conf/startup.conf DESTINATION etc/vpp COMPONENT vpp) +install(FILES conf/80-vpp.conf DESTINATION etc/sysctl.d COMPONENT vpp)